diff --git a/bare-tests/Check.fst.output.expected b/bare-tests/Check.fst.output.expected
index e0fbd7c9688..c1d131e22ce 100644
--- a/bare-tests/Check.fst.output.expected
+++ b/bare-tests/Check.fst.output.expected
@@ -1,9 +1,9 @@
-* Info at Check.fst(5,0-5,8):
+* Info at Check.fst:5.1-5.9:
   - Term 1 has type Prims.int
 
-* Info at Check.fst(6,0-6,10):
+* Info at Check.fst:6.1-6.11:
   - Term 1 + 1 has type Prims.int
 
-* Info at Check.fst(11,0-11,10):
+* Info at Check.fst:11.1-11.11:
   - Term Check.foo has type Prims.Tot (#_: Type -> x: _ -> Prims.Tot _)
 
diff --git a/src/basic/FStarC.Range.Ops.fst b/src/basic/FStarC.Range.Ops.fst
index 39a6d299a7c..07904cf7801 100644
--- a/src/basic/FStarC.Range.Ops.fst
+++ b/src/basic/FStarC.Range.Ops.fst
@@ -48,11 +48,11 @@ let rng_included r1 r2 =
     r2.end_pos >=? r1.end_pos
 
 let string_of_pos pos =
-    Format.fmt2 "%s,%s" (show pos.line) (show pos.col)
+    Format.fmt2 "%s.%s" (show pos.line) (show pos.col)
 let file_of_range r = r.def_range.file_name
 let set_file_of_range r (f:string) = {r with def_range = {r.def_range with file_name = Filepath.basename f}}
 let string_of_rng r =
-    Format.fmt3 "%s(%s-%s)" r.file_name (string_of_pos r.start_pos) (string_of_pos r.end_pos)
+    Format.fmt3 "%s:%s-%s" r.file_name (string_of_pos r.start_pos) (string_of_pos r.end_pos)
 let string_of_def_range r = string_of_rng r.def_range
 let string_of_use_range r = string_of_rng r.use_range
 let string_of_range r     = string_of_def_range r
@@ -90,7 +90,11 @@ let extend_to_end_of_line r = mk_range (file_of_range r)
                                        (end_of_line (end_of_range r))
 
 let json_of_pos pos =
-  JsonList [JsonInt (line_of_pos pos); JsonInt (col_of_pos pos)]
+  (* This -1 below is here since the IDE expects 0-based column numbers,
+     while we internally keep 1-based column numbers. In fact, the VS Code
+     extension does a +1 to adjust the number into 1-based numbering, so
+     that +1 and this -1 should both be removed. *)
+  JsonList [JsonInt (line_of_pos pos); JsonInt (col_of_pos pos - 1)]
 
 let json_of_range_fields file b e =
   JsonAssoc [("fname", JsonStr file);
diff --git a/src/interactive/FStarC.Interactive.Ide.fst b/src/interactive/FStarC.Interactive.Ide.fst
index 72401142ff2..8eb8a07d415 100644
--- a/src/interactive/FStarC.Interactive.Ide.fst
+++ b/src/interactive/FStarC.Interactive.Ide.fst
@@ -533,7 +533,7 @@ let run_segment (st: repl_state) (code: string) =
   // Unfortunately, frag_fname is a special case in the interactive mode,
   // while in LSP, it is the only mode. To cope with this difference,
   // pass a frag_fname that is expected by the Interactive mode.
-  let frag = { frag_fname = st.repl_fname; frag_text = code; frag_line = 1; frag_col = 0 } in
+  let frag = { frag_fname = st.repl_fname; frag_text = code; frag_line = 1; frag_col = 1 } in
 
   let collect_decls () =
     match Parser.Driver.parse_fragment None frag with
diff --git a/src/ml/FStarC_Format.ml b/src/ml/FStarC_Format.ml
index 4f9268314f5..04ae6573c32 100644
--- a/src/ml/FStarC_Format.ml
+++ b/src/ml/FStarC_Format.ml
@@ -15,11 +15,11 @@ let colorize (o, c) s =
   | _ -> s
 
 let colorize_bold    = colorize ("\x1b[39;1m", "\x1b[0m")
-let colorize_red     = colorize ("\x1b[31;1m", "\x1b[0m")
-let colorize_yellow  = colorize ("\x1b[33;1m", "\x1b[0m")
-let colorize_cyan    = colorize ("\x1b[36;1m", "\x1b[0m")
-let colorize_green   = colorize ("\x1b[32;1m", "\x1b[0m")
-let colorize_magenta = colorize ("\x1b[35;1m", "\x1b[0m")
+let colorize_red     = colorize ("\x1b[31m", "\x1b[0m")
+let colorize_yellow  = colorize ("\x1b[33m", "\x1b[0m")
+let colorize_cyan    = colorize ("\x1b[36m", "\x1b[0m")
+let colorize_green   = colorize ("\x1b[32m", "\x1b[0m")
+let colorize_magenta = colorize ("\x1b[35m", "\x1b[0m")
 
 type printer = {
   printer_prinfo: string -> unit;
diff --git a/src/ml/FStarC_Parser_ParseIt.ml b/src/ml/FStarC_Parser_ParseIt.ml
index 900dcda8506..6c33226c712 100644
--- a/src/ml/FStarC_Parser_ParseIt.ml
+++ b/src/ml/FStarC_Parser_ParseIt.ml
@@ -187,18 +187,19 @@ let parse_incremental_decls
   in
   parse []
 
-let contents_at contents =
+let contents_at (contents : string) : Range.t -> code_fragment =
     let lines = U.splitlines contents in
     let split_line_at_col line col =
-        if col > 0
+        (* NB: columns are 1-based *)
+        if col > 1
         then (
             (* Don't index directly into the string, since this is a UTF-8 string.
                 Convert first to a list of characters, index into that, and then convert
                 back to a string *)
             let chars = FStar_String.list_of_string line in
-            if col <= List.length chars
+            if col <= List.length chars + 1
             then (
-              let prefix, suffix = FStarC_Util.first_N (Z.of_int col) chars in
+              let prefix, suffix = FStarC_Util.first_N (Z.of_int (col - 1)) chars in
               Some (FStar_String.string_of_list prefix, 
                     FStar_String.string_of_list suffix)
             )
diff --git a/src/ml/FStarC_Parser_Util.ml b/src/ml/FStarC_Parser_Util.ml
index 8a97a447930..072c99e7340 100644
--- a/src/ml/FStarC_Parser_Util.ml
+++ b/src/ml/FStarC_Parser_Util.ml
@@ -12,7 +12,7 @@ type bytes = byte array
 let parseState = ()
 
 let pos_of_lexpos (p:position) =
-  mk_pos (Z.of_int p.pos_lnum) (Z.of_int (p.pos_cnum - p.pos_bol))
+  mk_pos (Z.of_int p.pos_lnum) (Z.of_int (1 + p.pos_cnum - p.pos_bol))
 
 let mksyn_range (p1:position) p2 =
   mk_range p1.pos_fname (pos_of_lexpos p1) (pos_of_lexpos p2)
diff --git a/src/tests/FStarC.Tests.Pars.fst b/src/tests/FStarC.Tests.Pars.fst
index 71925d17129..264c2895382 100644
--- a/src/tests/FStarC.Tests.Pars.fst
+++ b/src/tests/FStarC.Tests.Pars.fst
@@ -224,11 +224,11 @@ let parse_incremental_decls () =
   let input0 = Incremental { frag_fname = "Demo.fst";
                              frag_text = source0;
                              frag_line = 1;
-                             frag_col = 0 } in
+                             frag_col = 1 } in
   let input1 = Incremental { frag_fname = "Demo.fst";
                              frag_text = source1;
                              frag_line = 1;
-                             frag_col = 0 } in
+                             frag_col = 1 } in
   let open FStarC.Range in
   match parse None input0, parse None input1 with
   | IncrementalFragment (decls0, _, parse_err0),
@@ -250,8 +250,8 @@ let parse_incremental_decls () =
         | _, None ->
           failwith "Incremental parsing failed: Expected syntax error at (9, 6), got no error"
         | Some (_, _, rng0), Some (_, _, rng1)  ->
-          check_range rng0 11 6;
-          check_range rng1 12 6
+          check_range rng0 11 7;
+          check_range rng1 12 7
       in
       match decls0, decls1 with
       | [d0;d1;d2;d3;d4;d5],
diff --git a/tests/bug-reports/closed/Bug3757.fst.output.expected b/tests/bug-reports/closed/Bug3757.fst.output.expected
index 90c9fa182ff..d17e0512312 100644
--- a/tests/bug-reports/closed/Bug3757.fst.output.expected
+++ b/tests/bug-reports/closed/Bug3757.fst.output.expected
@@ -1,18 +1,18 @@
-* Info at Bug3757.fst(8,4-8,13):
+* Info at Bug3757.fst:8.5-8.14:
   - Expected failure:
   - Expected a pattern of type Prims.int & Prims.int
   - Type FStar.Pervasives.Native.tuple2 is not a record type.
 
-* Info at Bug3757.fst(12,28-12,31):
+* Info at Bug3757.fst:12.29-12.32:
   - Expected failure:
   - Expected an expression of type Prims.int & Prims.bool
   - Type FStar.Pervasives.Native.tuple2 is not a record type.
 
-* Info at Bug3757.fst(15,15-15,17):
+* Info at Bug3757.fst:15.16-15.18:
   - Expected failure:
   - Field name _1 could not be resolved.
 
-* Info at Bug3757.fst(21,9-21,11):
+* Info at Bug3757.fst:21.10-21.12:
   - Expected failure:
   - Field name f1 could not be resolved.
 
diff --git a/tests/bug-reports/closed/Bug3980.fst.output.expected b/tests/bug-reports/closed/Bug3980.fst.output.expected
index fa9dc9c94ae..5ee905338cf 100644
--- a/tests/bug-reports/closed/Bug3980.fst.output.expected
+++ b/tests/bug-reports/closed/Bug3980.fst.output.expected
@@ -1,26 +1,26 @@
-* Info at Bug3980.fst(16,0-16,24):
+* Info at Bug3980.fst:16.1-16.25:
   - Term Bug3980.p 1 ** Bug3980.p 2 ** Bug3980.p 3 has type Bug3980.slprop
 
-* Info at Bug3980.fst(17,0-17,26):
+* Info at Bug3980.fst:17.1-17.27:
   - Term (Bug3980.p 1 ** Bug3980.p 2) ** Bug3980.p 3 has type Bug3980.slprop
 
-* Info at Bug3980.fst(18,0-18,26):
+* Info at Bug3980.fst:18.1-18.27:
   - Term Bug3980.p 1 ** Bug3980.p 2 ** Bug3980.p 3 has type Bug3980.slprop
 
-* Info at Bug3980.fst(23,8-23,14):
+* Info at Bug3980.fst:23.9-23.15:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug3980.fst(23,15-23,23)
+  - See also Bug3980.fst:23.16-23.24
 
-* Info at Bug3980.fst(25,8-25,14):
+* Info at Bug3980.fst:25.9-25.15:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug3980.fst(25,15-25,23)
+  - See also Bug3980.fst:25.16-25.24
 
-* Info at Bug3980.fst(33,0-33,29):
+* Info at Bug3980.fst:33.1-33.30:
   - Term "a" |-> 1 ** "b" |-> 2 has type Bug3980.slprop
 
diff --git a/tests/error-messages/AQualMismatch.fst.json_output.expected b/tests/error-messages/AQualMismatch.fst.json_output.expected
index bf3fa3a76e6..596d2a81bff 100644
--- a/tests/error-messages/AQualMismatch.fst.json_output.expected
+++ b/tests/error-messages/AQualMismatch.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["AQualMismatch.f\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"AQualMismatch.fst","start_pos":{"line":3,"col":4},"end_pos":{"line":3,"col":5}},"use":{"file_name":"AQualMismatch.fst","start_pos":{"line":3,"col":4},"end_pos":{"line":3,"col":5}}},"number":240,"ctx":["While desugaring module AQualMismatch"]}
-{"msg":["Expected failure:","Inconsistent implicit argument annotation on argument x","Got: '#'","Expected: ''"],"level":"Info","range":{"def":{"file_name":"AQualMismatch.fst","start_pos":{"line":6,"col":7},"end_pos":{"line":6,"col":8}},"use":{"file_name":"AQualMismatch.fst","start_pos":{"line":6,"col":7},"end_pos":{"line":6,"col":8}}},"number":91,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
-{"msg":["Missing definitions in module AQualMismatch: f"],"level":"Warning","range":{"def":{"file_name":"AQualMismatch.fst","start_pos":{"line":6,"col":0},"end_pos":{"line":6,"col":12}},"use":{"file_name":"AQualMismatch.fst","start_pos":{"line":6,"col":0},"end_pos":{"line":6,"col":12}}},"number":240,"ctx":[]}
+{"msg":["AQualMismatch.f\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"AQualMismatch.fst","start_pos":{"line":3,"col":5},"end_pos":{"line":3,"col":6}},"use":{"file_name":"AQualMismatch.fst","start_pos":{"line":3,"col":5},"end_pos":{"line":3,"col":6}}},"number":240,"ctx":["While desugaring module AQualMismatch"]}
+{"msg":["Expected failure:","Inconsistent implicit argument annotation on argument x","Got: '#'","Expected: ''"],"level":"Info","range":{"def":{"file_name":"AQualMismatch.fst","start_pos":{"line":6,"col":8},"end_pos":{"line":6,"col":9}},"use":{"file_name":"AQualMismatch.fst","start_pos":{"line":6,"col":8},"end_pos":{"line":6,"col":9}}},"number":91,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
+{"msg":["Missing definitions in module AQualMismatch: f"],"level":"Warning","range":{"def":{"file_name":"AQualMismatch.fst","start_pos":{"line":6,"col":1},"end_pos":{"line":6,"col":13}},"use":{"file_name":"AQualMismatch.fst","start_pos":{"line":6,"col":1},"end_pos":{"line":6,"col":13}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/AQualMismatch.fst.output.expected b/tests/error-messages/AQualMismatch.fst.output.expected
index 9e9f0d0a9fd..3b3dd8fe698 100644
--- a/tests/error-messages/AQualMismatch.fst.output.expected
+++ b/tests/error-messages/AQualMismatch.fst.output.expected
@@ -1,13 +1,13 @@
-* Warning 240 at AQualMismatch.fst(3,4-3,5):
+* Warning 240 at AQualMismatch.fst:3.5-3.6:
   - AQualMismatch.f is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at AQualMismatch.fst(6,7-6,8):
+* Info at AQualMismatch.fst:6.8-6.9:
   - Expected failure:
   - Inconsistent implicit argument annotation on argument x
   - Got: '#'
   - Expected: ''
 
-* Warning 240 at AQualMismatch.fst(6,0-6,12):
+* Warning 240 at AQualMismatch.fst:6.1-6.13:
   - Missing definitions in module AQualMismatch: f
 
diff --git a/tests/error-messages/AnotType.fst.json_output.expected b/tests/error-messages/AnotType.fst.json_output.expected
index 96d6b489c44..1d17ce372ce 100644
--- a/tests/error-messages/AnotType.fst.json_output.expected
+++ b/tests/error-messages/AnotType.fst.json_output.expected
@@ -1,2 +1,2 @@
-{"msg":["Expected failure:","Type annotation Prims.int for inductive AnotType.tc is not Type or eqtype, or it\nis eqtype but contains noeq/unopteq qualifiers"],"level":"Info","range":{"def":{"file_name":"AnotType.fst","start_pos":{"line":19,"col":5},"end_pos":{"line":19,"col":7}},"use":{"file_name":"AnotType.fst","start_pos":{"line":19,"col":5},"end_pos":{"line":19,"col":7}}},"number":309,"ctx":["While typechecking the top-level declaration `type AnotType.tc`","While typechecking the top-level declaration `[@@expect_failure] type AnotType.tc`"]}
-{"msg":["Expected failure:","Expected expression of type Type0\ngot expression tb\nof type Type"],"level":"Info","range":{"def":{"file_name":"AnotType.fst","start_pos":{"line":27,"col":14},"end_pos":{"line":27,"col":16}},"use":{"file_name":"AnotType.fst","start_pos":{"line":27,"col":14},"end_pos":{"line":27,"col":16}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Type annotation Prims.int for inductive AnotType.tc is not Type or eqtype, or it\nis eqtype but contains noeq/unopteq qualifiers"],"level":"Info","range":{"def":{"file_name":"AnotType.fst","start_pos":{"line":19,"col":6},"end_pos":{"line":19,"col":8}},"use":{"file_name":"AnotType.fst","start_pos":{"line":19,"col":6},"end_pos":{"line":19,"col":8}}},"number":309,"ctx":["While typechecking the top-level declaration `type AnotType.tc`","While typechecking the top-level declaration `[@@expect_failure] type AnotType.tc`"]}
+{"msg":["Expected failure:","Expected expression of type Type0\ngot expression tb\nof type Type"],"level":"Info","range":{"def":{"file_name":"AnotType.fst","start_pos":{"line":27,"col":15},"end_pos":{"line":27,"col":17}},"use":{"file_name":"AnotType.fst","start_pos":{"line":27,"col":15},"end_pos":{"line":27,"col":17}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
diff --git a/tests/error-messages/AnotType.fst.output.expected b/tests/error-messages/AnotType.fst.output.expected
index be39ac42fed..797019f1c68 100644
--- a/tests/error-messages/AnotType.fst.output.expected
+++ b/tests/error-messages/AnotType.fst.output.expected
@@ -1,9 +1,9 @@
-* Info at AnotType.fst(19,5-19,7):
+* Info at AnotType.fst:19.6-19.8:
   - Expected failure:
   - Type annotation Prims.int for inductive AnotType.tc is not Type or eqtype,
     or it is eqtype but contains noeq/unopteq qualifiers
 
-* Info at AnotType.fst(27,14-27,16):
+* Info at AnotType.fst:27.15-27.17:
   - Expected failure:
   - Expected expression of type Type0 got expression tb of type Type
 
diff --git a/tests/error-messages/ArgsAndQuals.fst.json_output.expected b/tests/error-messages/ArgsAndQuals.fst.json_output.expected
index ac97807028f..a15906d5447 100644
--- a/tests/error-messages/ArgsAndQuals.fst.json_output.expected
+++ b/tests/error-messages/ArgsAndQuals.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["ArgsAndQuals.test1\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":9}},"use":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":9}}},"number":240,"ctx":["While desugaring module ArgsAndQuals"]}
-{"msg":["Expected failure:","Inconsistent implicit argument annotation on argument uu___","Got: '#'","Expected: '$'"],"level":"Info","range":{"def":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":25,"col":16},"end_pos":{"line":25,"col":18}},"use":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":25,"col":16},"end_pos":{"line":25,"col":18}}},"number":91,"ctx":["While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
-{"msg":["Missing definitions in module ArgsAndQuals: test1"],"level":"Warning","range":{"def":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":25,"col":0},"end_pos":{"line":25,"col":29}},"use":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":25,"col":0},"end_pos":{"line":25,"col":29}}},"number":240,"ctx":[]}
+{"msg":["ArgsAndQuals.test1\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":10}},"use":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":10}}},"number":240,"ctx":["While desugaring module ArgsAndQuals"]}
+{"msg":["Expected failure:","Inconsistent implicit argument annotation on argument uu___","Got: '#'","Expected: '$'"],"level":"Info","range":{"def":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":25,"col":17},"end_pos":{"line":25,"col":19}},"use":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":25,"col":17},"end_pos":{"line":25,"col":19}}},"number":91,"ctx":["While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
+{"msg":["Missing definitions in module ArgsAndQuals: test1"],"level":"Warning","range":{"def":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":25,"col":1},"end_pos":{"line":25,"col":30}},"use":{"file_name":"ArgsAndQuals.fst","start_pos":{"line":25,"col":1},"end_pos":{"line":25,"col":30}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/ArgsAndQuals.fst.output.expected b/tests/error-messages/ArgsAndQuals.fst.output.expected
index 2ffa8ce6264..c317cd54110 100644
--- a/tests/error-messages/ArgsAndQuals.fst.output.expected
+++ b/tests/error-messages/ArgsAndQuals.fst.output.expected
@@ -1,13 +1,13 @@
-* Warning 240 at ArgsAndQuals.fst(23,4-23,9):
+* Warning 240 at ArgsAndQuals.fst:23.5-23.10:
   - ArgsAndQuals.test1 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at ArgsAndQuals.fst(25,16-25,18):
+* Info at ArgsAndQuals.fst:25.17-25.19:
   - Expected failure:
   - Inconsistent implicit argument annotation on argument uu___
   - Got: '#'
   - Expected: '$'
 
-* Warning 240 at ArgsAndQuals.fst(25,0-25,29):
+* Warning 240 at ArgsAndQuals.fst:25.1-25.30:
   - Missing definitions in module ArgsAndQuals: test1
 
diff --git a/tests/error-messages/ArgsMismatch.fst.json_output.expected b/tests/error-messages/ArgsMismatch.fst.json_output.expected
index eab92693eb5..ba1492bdea9 100644
--- a/tests/error-messages/ArgsMismatch.fst.json_output.expected
+++ b/tests/error-messages/ArgsMismatch.fst.json_output.expected
@@ -1,12 +1,12 @@
-{"msg":["Expected failure:","Too many arguments to function of type y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":7,"col":33},"end_pos":{"line":7,"col":34}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":7,"col":33},"end_pos":{"line":7,"col":34}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Inconsistent argument qualifiers.","Expected an implicit argument, got an explicit one."],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":8,"col":35},"end_pos":{"line":8,"col":36}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":8,"col":35},"end_pos":{"line":8,"col":36}}},"number":92,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Too many arguments to function of type y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":10,"col":34},"end_pos":{"line":10,"col":35}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":10,"col":34},"end_pos":{"line":10,"col":35}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___1`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
-{"msg":["Expected failure:","Too many arguments to function of type y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":14,"col":33},"end_pos":{"line":14,"col":34}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":14,"col":33},"end_pos":{"line":14,"col":34}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___1`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
-{"msg":["Expected failure:","Inconsistent argument qualifiers.","Expected an implicit argument, got an explicit one."],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":15,"col":35},"end_pos":{"line":15,"col":36}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":15,"col":35},"end_pos":{"line":15,"col":36}}},"number":92,"ctx":["While typechecking the top-level declaration `let uu___1`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
-{"msg":["Expected failure:","Too many arguments to function of type y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":17,"col":34},"end_pos":{"line":17,"col":35}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":17,"col":34},"end_pos":{"line":17,"col":35}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___2`"]}
-{"msg":["Expected failure:","Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":21,"col":33},"end_pos":{"line":21,"col":34}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":21,"col":33},"end_pos":{"line":21,"col":34}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___2`"]}
-{"msg":["Expected failure:","Inconsistent argument qualifiers.","Expected an implicit argument, got an explicit one."],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":22,"col":35},"end_pos":{"line":22,"col":36}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":22,"col":35},"end_pos":{"line":22,"col":36}}},"number":92,"ctx":["While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___2`"]}
-{"msg":["Expected failure:","Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":24,"col":34},"end_pos":{"line":24,"col":35}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":24,"col":34},"end_pos":{"line":24,"col":35}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___3`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
-{"msg":["Expected failure:","Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":28,"col":33},"end_pos":{"line":28,"col":34}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":28,"col":33},"end_pos":{"line":28,"col":34}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___3`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
-{"msg":["Expected failure:","Inconsistent argument qualifiers.","Expected an implicit argument, got an explicit one."],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":29,"col":35},"end_pos":{"line":29,"col":36}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":29,"col":35},"end_pos":{"line":29,"col":36}}},"number":92,"ctx":["While typechecking the top-level declaration `let uu___3`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
-{"msg":["Expected failure:","Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":31,"col":34},"end_pos":{"line":31,"col":35}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":31,"col":34},"end_pos":{"line":31,"col":35}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
+{"msg":["Expected failure:","Too many arguments to function of type y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":7,"col":34},"end_pos":{"line":7,"col":35}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":7,"col":34},"end_pos":{"line":7,"col":35}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Inconsistent argument qualifiers.","Expected an implicit argument, got an explicit one."],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":8,"col":36},"end_pos":{"line":8,"col":37}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":8,"col":36},"end_pos":{"line":8,"col":37}}},"number":92,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Too many arguments to function of type y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":10,"col":35},"end_pos":{"line":10,"col":36}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":10,"col":35},"end_pos":{"line":10,"col":36}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___1`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
+{"msg":["Expected failure:","Too many arguments to function of type y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":14,"col":34},"end_pos":{"line":14,"col":35}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":14,"col":34},"end_pos":{"line":14,"col":35}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___1`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
+{"msg":["Expected failure:","Inconsistent argument qualifiers.","Expected an implicit argument, got an explicit one."],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":15,"col":36},"end_pos":{"line":15,"col":37}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":15,"col":36},"end_pos":{"line":15,"col":37}}},"number":92,"ctx":["While typechecking the top-level declaration `let uu___1`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
+{"msg":["Expected failure:","Too many arguments to function of type y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":17,"col":35},"end_pos":{"line":17,"col":36}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":17,"col":35},"end_pos":{"line":17,"col":36}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___2`"]}
+{"msg":["Expected failure:","Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":21,"col":34},"end_pos":{"line":21,"col":35}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":21,"col":34},"end_pos":{"line":21,"col":35}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___2`"]}
+{"msg":["Expected failure:","Inconsistent argument qualifiers.","Expected an implicit argument, got an explicit one."],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":22,"col":36},"end_pos":{"line":22,"col":37}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":22,"col":36},"end_pos":{"line":22,"col":37}}},"number":92,"ctx":["While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___2`"]}
+{"msg":["Expected failure:","Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":24,"col":35},"end_pos":{"line":24,"col":36}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":24,"col":35},"end_pos":{"line":24,"col":36}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___3`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
+{"msg":["Expected failure:","Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":28,"col":34},"end_pos":{"line":28,"col":35}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":28,"col":34},"end_pos":{"line":28,"col":35}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___3`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
+{"msg":["Expected failure:","Inconsistent argument qualifiers.","Expected an implicit argument, got an explicit one."],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":29,"col":36},"end_pos":{"line":29,"col":37}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":29,"col":36},"end_pos":{"line":29,"col":37}}},"number":92,"ctx":["While typechecking the top-level declaration `let uu___3`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
+{"msg":["Expected failure:","Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int","Got\n2\narguments","Remaining type is Prims.int"],"level":"Info","range":{"def":{"file_name":"ArgsMismatch.fst","start_pos":{"line":31,"col":35},"end_pos":{"line":31,"col":36}},"use":{"file_name":"ArgsMismatch.fst","start_pos":{"line":31,"col":35},"end_pos":{"line":31,"col":36}}},"number":173,"ctx":["While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
diff --git a/tests/error-messages/ArgsMismatch.fst.output.expected b/tests/error-messages/ArgsMismatch.fst.output.expected
index 25419b49d32..a513e845b93 100644
--- a/tests/error-messages/ArgsMismatch.fst.output.expected
+++ b/tests/error-messages/ArgsMismatch.fst.output.expected
@@ -1,66 +1,66 @@
-* Info at ArgsMismatch.fst(7,33-7,34):
+* Info at ArgsMismatch.fst:7.34-7.35:
   - Expected failure:
   - Too many arguments to function of type y: Prims.int -> Prims.int
   - Got 2 arguments
   - Remaining type is Prims.int
 
-* Info at ArgsMismatch.fst(8,35-8,36):
+* Info at ArgsMismatch.fst:8.36-8.37:
   - Expected failure:
   - Inconsistent argument qualifiers.
   - Expected an implicit argument, got an explicit one.
 
-* Info at ArgsMismatch.fst(10,34-10,35):
+* Info at ArgsMismatch.fst:10.35-10.36:
   - Expected failure:
   - Too many arguments to function of type y: Prims.int -> Prims.int
   - Got 2 arguments
   - Remaining type is Prims.int
 
-* Info at ArgsMismatch.fst(14,33-14,34):
+* Info at ArgsMismatch.fst:14.34-14.35:
   - Expected failure:
   - Too many arguments to function of type y: Prims.int -> Prims.int
   - Got 2 arguments
   - Remaining type is Prims.int
 
-* Info at ArgsMismatch.fst(15,35-15,36):
+* Info at ArgsMismatch.fst:15.36-15.37:
   - Expected failure:
   - Inconsistent argument qualifiers.
   - Expected an implicit argument, got an explicit one.
 
-* Info at ArgsMismatch.fst(17,34-17,35):
+* Info at ArgsMismatch.fst:17.35-17.36:
   - Expected failure:
   - Too many arguments to function of type y: Prims.int -> Prims.int
   - Got 2 arguments
   - Remaining type is Prims.int
 
-* Info at ArgsMismatch.fst(21,33-21,34):
+* Info at ArgsMismatch.fst:21.34-21.35:
   - Expected failure:
   - Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int
   - Got 2 arguments
   - Remaining type is Prims.int
 
-* Info at ArgsMismatch.fst(22,35-22,36):
+* Info at ArgsMismatch.fst:22.36-22.37:
   - Expected failure:
   - Inconsistent argument qualifiers.
   - Expected an implicit argument, got an explicit one.
 
-* Info at ArgsMismatch.fst(24,34-24,35):
+* Info at ArgsMismatch.fst:24.35-24.36:
   - Expected failure:
   - Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int
   - Got 2 arguments
   - Remaining type is Prims.int
 
-* Info at ArgsMismatch.fst(28,33-28,34):
+* Info at ArgsMismatch.fst:28.34-28.35:
   - Expected failure:
   - Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int
   - Got 2 arguments
   - Remaining type is Prims.int
 
-* Info at ArgsMismatch.fst(29,35-29,36):
+* Info at ArgsMismatch.fst:29.36-29.37:
   - Expected failure:
   - Inconsistent argument qualifiers.
   - Expected an implicit argument, got an explicit one.
 
-* Info at ArgsMismatch.fst(31,34-31,35):
+* Info at ArgsMismatch.fst:31.35-31.36:
   - Expected failure:
   - Too many arguments to function of type [@@@ 2]y: Prims.int -> Prims.int
   - Got 2 arguments
diff --git a/tests/error-messages/ArrowRanges.fst.json_output.expected b/tests/error-messages/ArrowRanges.fst.json_output.expected
index 3c9e3468827..a541fa0538d 100644
--- a/tests/error-messages/ArrowRanges.fst.json_output.expected
+++ b/tests/error-messages/ArrowRanges.fst.json_output.expected
@@ -1,2 +1,2 @@
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.eqtype\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":81,"col":23},"end_pos":{"line":81,"col":30}},"use":{"file_name":"ArrowRanges.fst","start_pos":{"line":4,"col":30},"end_pos":{"line":4,"col":39}}},"number":19,"ctx":["While typechecking the top-level declaration `let ppof`","While typechecking the top-level declaration `[@@expect_failure] let ppof`"]}
-{"msg":["Expected failure:","Failed to prove that the type\n'ArrowRanges.ppof'\nsupports decidable equality because of this argument.","Add either the 'noeq' or 'unopteq' qualifier","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"ArrowRanges.fst","start_pos":{"line":7,"col":0},"end_pos":{"line":11,"col":1}},"use":{"file_name":"ArrowRanges.fst","start_pos":{"line":8,"col":10},"end_pos":{"line":8,"col":28}}},"number":19,"ctx":["While typechecking the top-level declaration `type ArrowRanges.ppof`","While typechecking the top-level declaration `[@@expect_failure] type ArrowRanges.ppof`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.eqtype\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":81,"col":24},"end_pos":{"line":81,"col":31}},"use":{"file_name":"ArrowRanges.fst","start_pos":{"line":4,"col":31},"end_pos":{"line":4,"col":40}}},"number":19,"ctx":["While typechecking the top-level declaration `let ppof`","While typechecking the top-level declaration `[@@expect_failure] let ppof`"]}
+{"msg":["Expected failure:","Failed to prove that the type\n'ArrowRanges.ppof'\nsupports decidable equality because of this argument.","Add either the 'noeq' or 'unopteq' qualifier","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"ArrowRanges.fst","start_pos":{"line":7,"col":1},"end_pos":{"line":11,"col":2}},"use":{"file_name":"ArrowRanges.fst","start_pos":{"line":8,"col":11},"end_pos":{"line":8,"col":29}}},"number":19,"ctx":["While typechecking the top-level declaration `type ArrowRanges.ppof`","While typechecking the top-level declaration `[@@expect_failure] type ArrowRanges.ppof`"]}
diff --git a/tests/error-messages/ArrowRanges.fst.output.expected b/tests/error-messages/ArrowRanges.fst.output.expected
index 27921de8b40..d79fdbdca2b 100644
--- a/tests/error-messages/ArrowRanges.fst.output.expected
+++ b/tests/error-messages/ArrowRanges.fst.output.expected
@@ -1,12 +1,12 @@
-* Info at ArrowRanges.fst(4,30-4,39):
+* Info at ArrowRanges.fst:4.31-4.40:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.eqtype got type Type0
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(81,23-81,30)
+  - See also Prims.fst:81.24-81.31
 
-* Info at ArrowRanges.fst(8,10-8,28):
+* Info at ArrowRanges.fst:8.11-8.29:
   - Expected failure:
   - Failed to prove that the type
     'ArrowRanges.ppof'
@@ -14,5 +14,5 @@
   - Add either the 'noeq' or 'unopteq' qualifier
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also ArrowRanges.fst(7,0-11,1)
+  - See also ArrowRanges.fst:7.1-11.2
 
diff --git a/tests/error-messages/AssertNorm.fst.json_output.expected b/tests/error-messages/AssertNorm.fst.json_output.expected
index bab8491ba49..f8f892ced39 100644
--- a/tests/error-messages/AssertNorm.fst.json_output.expected
+++ b/tests/error-messages/AssertNorm.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"AssertNorm.fst","start_pos":{"line":7,"col":14},"end_pos":{"line":7,"col":30}},"use":{"file_name":"AssertNorm.fst","start_pos":{"line":7,"col":2},"end_pos":{"line":7,"col":13}}},"number":19,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"AssertNorm.fst","start_pos":{"line":7,"col":15},"end_pos":{"line":7,"col":31}},"use":{"file_name":"AssertNorm.fst","start_pos":{"line":7,"col":3},"end_pos":{"line":7,"col":14}}},"number":19,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
diff --git a/tests/error-messages/AssertNorm.fst.output.expected b/tests/error-messages/AssertNorm.fst.output.expected
index 2d10bd879c2..78e9e4572ff 100644
--- a/tests/error-messages/AssertNorm.fst.output.expected
+++ b/tests/error-messages/AssertNorm.fst.output.expected
@@ -1,7 +1,7 @@
-* Info at AssertNorm.fst(7,2-7,13):
+* Info at AssertNorm.fst:7.3-7.14:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also AssertNorm.fst(7,14-7,30)
+  - See also AssertNorm.fst:7.15-7.31
 
diff --git a/tests/error-messages/Asserts.fst.json_output.expected b/tests/error-messages/Asserts.fst.json_output.expected
index 999c3931263..4817021dac7 100644
--- a/tests/error-messages/Asserts.fst.json_output.expected
+++ b/tests/error-messages/Asserts.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Asserts.fst","start_pos":{"line":6,"col":9},"end_pos":{"line":6,"col":17}},"use":{"file_name":"Asserts.fst","start_pos":{"line":6,"col":2},"end_pos":{"line":6,"col":8}}},"number":19,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Asserts.fst","start_pos":{"line":11,"col":9},"end_pos":{"line":11,"col":17}},"use":{"file_name":"Asserts.fst","start_pos":{"line":11,"col":2},"end_pos":{"line":11,"col":8}}},"number":19,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Asserts.fst","start_pos":{"line":16,"col":9},"end_pos":{"line":16,"col":14}},"use":{"file_name":"Asserts.fst","start_pos":{"line":16,"col":2},"end_pos":{"line":16,"col":8}}},"number":19,"ctx":["While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Asserts.fst","start_pos":{"line":6,"col":10},"end_pos":{"line":6,"col":18}},"use":{"file_name":"Asserts.fst","start_pos":{"line":6,"col":3},"end_pos":{"line":6,"col":9}}},"number":19,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Asserts.fst","start_pos":{"line":11,"col":10},"end_pos":{"line":11,"col":18}},"use":{"file_name":"Asserts.fst","start_pos":{"line":11,"col":3},"end_pos":{"line":11,"col":9}}},"number":19,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Asserts.fst","start_pos":{"line":16,"col":10},"end_pos":{"line":16,"col":15}},"use":{"file_name":"Asserts.fst","start_pos":{"line":16,"col":3},"end_pos":{"line":16,"col":9}}},"number":19,"ctx":["While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
diff --git a/tests/error-messages/Asserts.fst.output.expected b/tests/error-messages/Asserts.fst.output.expected
index 06c8b6e28a3..827007a6d3e 100644
--- a/tests/error-messages/Asserts.fst.output.expected
+++ b/tests/error-messages/Asserts.fst.output.expected
@@ -1,21 +1,21 @@
-* Info at Asserts.fst(6,2-6,8):
+* Info at Asserts.fst:6.3-6.9:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Asserts.fst(6,9-6,17)
+  - See also Asserts.fst:6.10-6.18
 
-* Info at Asserts.fst(11,2-11,8):
+* Info at Asserts.fst:11.3-11.9:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Asserts.fst(11,9-11,17)
+  - See also Asserts.fst:11.10-11.18
 
-* Info at Asserts.fst(16,2-16,8):
+* Info at Asserts.fst:16.3-16.9:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Asserts.fst(16,9-16,14)
+  - See also Asserts.fst:16.10-16.15
 
diff --git a/tests/error-messages/BadEmptyRecord.fst.json_output.expected b/tests/error-messages/BadEmptyRecord.fst.json_output.expected
index eef34bf1750..da84e5a38b8 100644
--- a/tests/error-messages/BadEmptyRecord.fst.json_output.expected
+++ b/tests/error-messages/BadEmptyRecord.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Could not resolve the type for this record."],"level":"Info","range":{"def":{"file_name":"BadEmptyRecord.fst","start_pos":{"line":9,"col":6},"end_pos":{"line":9,"col":8}},"use":{"file_name":"BadEmptyRecord.fst","start_pos":{"line":9,"col":6},"end_pos":{"line":9,"col":8}}},"number":360,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
+{"msg":["Expected failure:","Could not resolve the type for this record."],"level":"Info","range":{"def":{"file_name":"BadEmptyRecord.fst","start_pos":{"line":9,"col":7},"end_pos":{"line":9,"col":9}},"use":{"file_name":"BadEmptyRecord.fst","start_pos":{"line":9,"col":7},"end_pos":{"line":9,"col":9}}},"number":360,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
diff --git a/tests/error-messages/BadEmptyRecord.fst.output.expected b/tests/error-messages/BadEmptyRecord.fst.output.expected
index 4b26a9fe48c..522c7e7e0cb 100644
--- a/tests/error-messages/BadEmptyRecord.fst.output.expected
+++ b/tests/error-messages/BadEmptyRecord.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at BadEmptyRecord.fst(9,6-9,8):
+* Info at BadEmptyRecord.fst:9.7-9.9:
   - Expected failure:
   - Could not resolve the type for this record.
 
diff --git a/tests/error-messages/Basic.fst.json_output.expected b/tests/error-messages/Basic.fst.json_output.expected
index e90319094e3..97a7b7b17ee 100644
--- a/tests/error-messages/Basic.fst.json_output.expected
+++ b/tests/error-messages/Basic.fst.json_output.expected
@@ -1,12 +1,12 @@
-{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression true\nof type Prims.bool"],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":4,"col":13},"end_pos":{"line":4,"col":17}},"use":{"file_name":"Basic.fst","start_pos":{"line":4,"col":13},"end_pos":{"line":4,"col":17}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":6,"col":45},"end_pos":{"line":6,"col":50}},"use":{"file_name":"Basic.fst","start_pos":{"line":6,"col":38},"end_pos":{"line":6,"col":44}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":7,"col":45},"end_pos":{"line":7,"col":50}},"use":{"file_name":"Basic.fst","start_pos":{"line":7,"col":38},"end_pos":{"line":7,"col":44}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":8,"col":45},"end_pos":{"line":8,"col":50}},"use":{"file_name":"Basic.fst","start_pos":{"line":8,"col":38},"end_pos":{"line":8,"col":44}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":9,"col":45},"end_pos":{"line":9,"col":50}},"use":{"file_name":"Basic.fst","start_pos":{"line":9,"col":38},"end_pos":{"line":9,"col":44}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":11,"col":50},"end_pos":{"line":11,"col":55}},"use":{"file_name":"Basic.fst","start_pos":{"line":11,"col":38},"end_pos":{"line":11,"col":49}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":12,"col":50},"end_pos":{"line":12,"col":55}},"use":{"file_name":"Basic.fst","start_pos":{"line":12,"col":38},"end_pos":{"line":12,"col":49}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":13,"col":50},"end_pos":{"line":13,"col":55}},"use":{"file_name":"Basic.fst","start_pos":{"line":13,"col":38},"end_pos":{"line":13,"col":49}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":14,"col":50},"end_pos":{"line":14,"col":55}},"use":{"file_name":"Basic.fst","start_pos":{"line":14,"col":38},"end_pos":{"line":14,"col":49}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":90},"end_pos":{"line":459,"col":102}},"use":{"file_name":"Basic.fst","start_pos":{"line":17,"col":29},"end_pos":{"line":17,"col":31}}},"number":19,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":90},"end_pos":{"line":459,"col":102}},"use":{"file_name":"Basic.fst","start_pos":{"line":20,"col":29},"end_pos":{"line":20,"col":31}}},"number":19,"ctx":["While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":90},"end_pos":{"line":459,"col":102}},"use":{"file_name":"Basic.fst","start_pos":{"line":23,"col":46},"end_pos":{"line":23,"col":48}}},"number":19,"ctx":["While typechecking the top-level declaration `let test6`","While typechecking the top-level declaration `[@@expect_failure] let test6`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression true\nof type Prims.bool"],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":4,"col":14},"end_pos":{"line":4,"col":18}},"use":{"file_name":"Basic.fst","start_pos":{"line":4,"col":14},"end_pos":{"line":4,"col":18}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":6,"col":46},"end_pos":{"line":6,"col":51}},"use":{"file_name":"Basic.fst","start_pos":{"line":6,"col":39},"end_pos":{"line":6,"col":45}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":7,"col":46},"end_pos":{"line":7,"col":51}},"use":{"file_name":"Basic.fst","start_pos":{"line":7,"col":39},"end_pos":{"line":7,"col":45}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":8,"col":46},"end_pos":{"line":8,"col":51}},"use":{"file_name":"Basic.fst","start_pos":{"line":8,"col":39},"end_pos":{"line":8,"col":45}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":9,"col":46},"end_pos":{"line":9,"col":51}},"use":{"file_name":"Basic.fst","start_pos":{"line":9,"col":39},"end_pos":{"line":9,"col":45}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":11,"col":51},"end_pos":{"line":11,"col":56}},"use":{"file_name":"Basic.fst","start_pos":{"line":11,"col":39},"end_pos":{"line":11,"col":50}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":12,"col":51},"end_pos":{"line":12,"col":56}},"use":{"file_name":"Basic.fst","start_pos":{"line":12,"col":39},"end_pos":{"line":12,"col":50}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":13,"col":51},"end_pos":{"line":13,"col":56}},"use":{"file_name":"Basic.fst","start_pos":{"line":13,"col":39},"end_pos":{"line":13,"col":50}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Basic.fst","start_pos":{"line":14,"col":51},"end_pos":{"line":14,"col":56}},"use":{"file_name":"Basic.fst","start_pos":{"line":14,"col":39},"end_pos":{"line":14,"col":50}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":91},"end_pos":{"line":459,"col":103}},"use":{"file_name":"Basic.fst","start_pos":{"line":17,"col":30},"end_pos":{"line":17,"col":32}}},"number":19,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":91},"end_pos":{"line":459,"col":103}},"use":{"file_name":"Basic.fst","start_pos":{"line":20,"col":30},"end_pos":{"line":20,"col":32}}},"number":19,"ctx":["While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":91},"end_pos":{"line":459,"col":103}},"use":{"file_name":"Basic.fst","start_pos":{"line":23,"col":47},"end_pos":{"line":23,"col":49}}},"number":19,"ctx":["While typechecking the top-level declaration `let test6`","While typechecking the top-level declaration `[@@expect_failure] let test6`"]}
diff --git a/tests/error-messages/Basic.fst.output.expected b/tests/error-messages/Basic.fst.output.expected
index d7103dfde83..0d65738c55d 100644
--- a/tests/error-messages/Basic.fst.output.expected
+++ b/tests/error-messages/Basic.fst.output.expected
@@ -1,81 +1,81 @@
-* Info at Basic.fst(4,13-4,17):
+* Info at Basic.fst:4.14-4.18:
   - Expected failure:
   - Expected expression of type Prims.int got expression true of type Prims.bool
 
-* Info at Basic.fst(6,38-6,44):
+* Info at Basic.fst:6.39-6.45:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Basic.fst(6,45-6,50)
+  - See also Basic.fst:6.46-6.51
 
-* Info at Basic.fst(7,38-7,44):
+* Info at Basic.fst:7.39-7.45:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Basic.fst(7,45-7,50)
+  - See also Basic.fst:7.46-7.51
 
-* Info at Basic.fst(8,38-8,44):
+* Info at Basic.fst:8.39-8.45:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Basic.fst(8,45-8,50)
+  - See also Basic.fst:8.46-8.51
 
-* Info at Basic.fst(9,38-9,44):
+* Info at Basic.fst:9.39-9.45:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Basic.fst(9,45-9,50)
+  - See also Basic.fst:9.46-9.51
 
-* Info at Basic.fst(11,38-11,49):
+* Info at Basic.fst:11.39-11.50:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Basic.fst(11,50-11,55)
+  - See also Basic.fst:11.51-11.56
 
-* Info at Basic.fst(12,38-12,49):
+* Info at Basic.fst:12.39-12.50:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Basic.fst(12,50-12,55)
+  - See also Basic.fst:12.51-12.56
 
-* Info at Basic.fst(13,38-13,49):
+* Info at Basic.fst:13.39-13.50:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Basic.fst(13,50-13,55)
+  - See also Basic.fst:13.51-13.56
 
-* Info at Basic.fst(14,38-14,49):
+* Info at Basic.fst:14.39-14.50:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Basic.fst(14,50-14,55)
+  - See also Basic.fst:14.51-14.56
 
-* Info at Basic.fst(17,29-17,31):
+* Info at Basic.fst:17.30-17.32:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(459,90-459,102)
+  - See also Prims.fst:459.91-459.103
 
-* Info at Basic.fst(20,29-20,31):
+* Info at Basic.fst:20.30-20.32:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(459,90-459,102)
+  - See also Prims.fst:459.91-459.103
 
-* Info at Basic.fst(23,46-23,48):
+* Info at Basic.fst:23.47-23.49:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(459,90-459,102)
+  - See also Prims.fst:459.91-459.103
 
diff --git a/tests/error-messages/Bug1918.fst.json_output.expected b/tests/error-messages/Bug1918.fst.json_output.expected
index 265c5c873a8..26dc5c1d85d 100644
--- a/tests/error-messages/Bug1918.fst.json_output.expected
+++ b/tests/error-messages/Bug1918.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Tactic failed","Could not solve typeclass constraint `Bug1918.mon`"],"level":"Info","range":{"def":{"file_name":"Bug1918.fst","start_pos":{"line":11,"col":13},"end_pos":{"line":11,"col":14}},"use":{"file_name":"Bug1918.fst","start_pos":{"line":11,"col":13},"end_pos":{"line":11,"col":14}}},"number":228,"ctx":["While synthesizing term with a tactic","Running tactic for meta-arg","While typechecking the top-level declaration `let comp2`","While typechecking the top-level declaration `[@@expect_failure] let comp2`"]}
+{"msg":["Expected failure:","Tactic failed","Could not solve typeclass constraint `Bug1918.mon`"],"level":"Info","range":{"def":{"file_name":"Bug1918.fst","start_pos":{"line":11,"col":14},"end_pos":{"line":11,"col":15}},"use":{"file_name":"Bug1918.fst","start_pos":{"line":11,"col":14},"end_pos":{"line":11,"col":15}}},"number":228,"ctx":["While synthesizing term with a tactic","Running tactic for meta-arg","While typechecking the top-level declaration `let comp2`","While typechecking the top-level declaration `[@@expect_failure] let comp2`"]}
diff --git a/tests/error-messages/Bug1918.fst.output.expected b/tests/error-messages/Bug1918.fst.output.expected
index 9219b9d2d30..6c3c444bc22 100644
--- a/tests/error-messages/Bug1918.fst.output.expected
+++ b/tests/error-messages/Bug1918.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at Bug1918.fst(11,13-11,14):
+* Info at Bug1918.fst:11.14-11.15:
   - Expected failure:
   - Tactic failed
   - Could not solve typeclass constraint `Bug1918.mon`
diff --git a/tests/error-messages/Bug1988.fst.json_output.expected b/tests/error-messages/Bug1988.fst.json_output.expected
index f7f34a1ab64..de7ee561b46 100644
--- a/tests/error-messages/Bug1988.fst.json_output.expected
+++ b/tests/error-messages/Bug1988.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression \"string literal\"\nof type Prims.string"],"level":"Info","range":{"def":{"file_name":"Bug1988.fst","start_pos":{"line":4,"col":14},"end_pos":{"line":4,"col":30}},"use":{"file_name":"Bug1988.fst","start_pos":{"line":4,"col":14},"end_pos":{"line":4,"col":30}}},"number":189,"ctx":["While typechecking the top-level declaration `let x`","While typechecking the top-level declaration `[@@expect_failure] let x`"]}
-{"msg":["Expected failure:","Prims.string is not equal to the expected type _: ident -> Prims.string"],"level":"Info","range":{"def":{"file_name":"Bug1988.fst","start_pos":{"line":15,"col":32},"end_pos":{"line":15,"col":38}},"use":{"file_name":"Bug1988.fst","start_pos":{"line":15,"col":32},"end_pos":{"line":15,"col":38}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let f1`","While typechecking the top-level declaration `[@@expect_failure] let f1`"]}
-{"msg":["Expected failure:","Prims.string is not a subtype of the expected type _: (*?u21*)_ -> (*?u22*)_"],"level":"Info","range":{"def":{"file_name":"Bug1988.fst","start_pos":{"line":21,"col":32},"end_pos":{"line":21,"col":38}},"use":{"file_name":"Bug1988.fst","start_pos":{"line":21,"col":32},"end_pos":{"line":21,"col":38}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let f2`","While typechecking the top-level declaration `[@@expect_failure] let f2`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression \"string literal\"\nof type Prims.string"],"level":"Info","range":{"def":{"file_name":"Bug1988.fst","start_pos":{"line":4,"col":15},"end_pos":{"line":4,"col":31}},"use":{"file_name":"Bug1988.fst","start_pos":{"line":4,"col":15},"end_pos":{"line":4,"col":31}}},"number":189,"ctx":["While typechecking the top-level declaration `let x`","While typechecking the top-level declaration `[@@expect_failure] let x`"]}
+{"msg":["Expected failure:","Prims.string is not equal to the expected type _: ident -> Prims.string"],"level":"Info","range":{"def":{"file_name":"Bug1988.fst","start_pos":{"line":15,"col":33},"end_pos":{"line":15,"col":39}},"use":{"file_name":"Bug1988.fst","start_pos":{"line":15,"col":33},"end_pos":{"line":15,"col":39}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let f1`","While typechecking the top-level declaration `[@@expect_failure] let f1`"]}
+{"msg":["Expected failure:","Prims.string is not a subtype of the expected type _: (*?u21*)_ -> (*?u22*)_"],"level":"Info","range":{"def":{"file_name":"Bug1988.fst","start_pos":{"line":21,"col":33},"end_pos":{"line":21,"col":39}},"use":{"file_name":"Bug1988.fst","start_pos":{"line":21,"col":33},"end_pos":{"line":21,"col":39}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let f2`","While typechecking the top-level declaration `[@@expect_failure] let f2`"]}
diff --git a/tests/error-messages/Bug1988.fst.output.expected b/tests/error-messages/Bug1988.fst.output.expected
index 362407e656d..2dfeb4c4116 100644
--- a/tests/error-messages/Bug1988.fst.output.expected
+++ b/tests/error-messages/Bug1988.fst.output.expected
@@ -1,14 +1,14 @@
-* Info at Bug1988.fst(4,14-4,30):
+* Info at Bug1988.fst:4.15-4.31:
   - Expected failure:
   - Expected expression of type Prims.int
     got expression "string literal"
     of type Prims.string
 
-* Info at Bug1988.fst(15,32-15,38):
+* Info at Bug1988.fst:15.33-15.39:
   - Expected failure:
   - Prims.string is not equal to the expected type _: ident -> Prims.string
 
-* Info at Bug1988.fst(21,32-21,38):
+* Info at Bug1988.fst:21.33-21.39:
   - Expected failure:
   - Prims.string is not a subtype of the expected type _: (*?u21*)_ -> (*?u22*)_
 
diff --git a/tests/error-messages/Bug1997.fst.json_output.expected b/tests/error-messages/Bug1997.fst.json_output.expected
index 61179151dd5..b909db255b1 100644
--- a/tests/error-messages/Bug1997.fst.json_output.expected
+++ b/tests/error-messages/Bug1997.fst.json_output.expected
@@ -160,31 +160,31 @@ let _ = FStar.Pervasives.assert_norm (Bug1997.n0 == Bug1997.n1)
 
 ]
 
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":13,"col":39},"end_pos":{"line":13,"col":55}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":13,"col":27},"end_pos":{"line":13,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___1`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":21,"col":39},"end_pos":{"line":21,"col":67}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":21,"col":27},"end_pos":{"line":21,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___2`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":29,"col":39},"end_pos":{"line":29,"col":63}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":29,"col":27},"end_pos":{"line":29,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___3`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":38,"col":39},"end_pos":{"line":38,"col":65}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":38,"col":27},"end_pos":{"line":38,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":39,"col":39},"end_pos":{"line":39,"col":65}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":39,"col":27},"end_pos":{"line":39,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":40,"col":39},"end_pos":{"line":40,"col":65}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":40,"col":27},"end_pos":{"line":40,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":41,"col":39},"end_pos":{"line":41,"col":65}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":41,"col":27},"end_pos":{"line":41,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":42,"col":39},"end_pos":{"line":42,"col":65}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":42,"col":27},"end_pos":{"line":42,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":51,"col":39},"end_pos":{"line":51,"col":59}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":51,"col":27},"end_pos":{"line":51,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":52,"col":39},"end_pos":{"line":52,"col":59}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":52,"col":27},"end_pos":{"line":52,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":53,"col":39},"end_pos":{"line":53,"col":59}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":53,"col":27},"end_pos":{"line":53,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":54,"col":39},"end_pos":{"line":54,"col":59}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":54,"col":27},"end_pos":{"line":54,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":55,"col":39},"end_pos":{"line":55,"col":59}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":55,"col":27},"end_pos":{"line":55,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":63,"col":39},"end_pos":{"line":63,"col":51}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":63,"col":27},"end_pos":{"line":63,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___6`","While typechecking the top-level declaration `[@@expect_failure] let uu___6`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":64,"col":39},"end_pos":{"line":64,"col":51}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":64,"col":27},"end_pos":{"line":64,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___6`","While typechecking the top-level declaration `[@@expect_failure] let uu___6`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":75,"col":39},"end_pos":{"line":75,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":75,"col":27},"end_pos":{"line":75,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___9`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":76,"col":39},"end_pos":{"line":76,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":76,"col":27},"end_pos":{"line":76,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___9`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":77,"col":39},"end_pos":{"line":77,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":77,"col":27},"end_pos":{"line":77,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___9`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":78,"col":39},"end_pos":{"line":78,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":78,"col":27},"end_pos":{"line":78,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___9`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":87,"col":39},"end_pos":{"line":87,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":87,"col":27},"end_pos":{"line":87,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":88,"col":39},"end_pos":{"line":88,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":88,"col":27},"end_pos":{"line":88,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":89,"col":39},"end_pos":{"line":89,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":89,"col":27},"end_pos":{"line":89,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":90,"col":39},"end_pos":{"line":90,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":90,"col":27},"end_pos":{"line":90,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":91,"col":39},"end_pos":{"line":91,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":91,"col":27},"end_pos":{"line":91,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":92,"col":39},"end_pos":{"line":92,"col":49}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":92,"col":27},"end_pos":{"line":92,"col":38}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":13,"col":40},"end_pos":{"line":13,"col":56}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":13,"col":28},"end_pos":{"line":13,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___1`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":21,"col":40},"end_pos":{"line":21,"col":68}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":21,"col":28},"end_pos":{"line":21,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___2`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":29,"col":40},"end_pos":{"line":29,"col":64}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":29,"col":28},"end_pos":{"line":29,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___3`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":38,"col":40},"end_pos":{"line":38,"col":66}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":38,"col":28},"end_pos":{"line":38,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":39,"col":40},"end_pos":{"line":39,"col":66}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":39,"col":28},"end_pos":{"line":39,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":40,"col":40},"end_pos":{"line":40,"col":66}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":40,"col":28},"end_pos":{"line":40,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":41,"col":40},"end_pos":{"line":41,"col":66}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":41,"col":28},"end_pos":{"line":41,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":42,"col":40},"end_pos":{"line":42,"col":66}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":42,"col":28},"end_pos":{"line":42,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___4`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":51,"col":40},"end_pos":{"line":51,"col":60}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":51,"col":28},"end_pos":{"line":51,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":52,"col":40},"end_pos":{"line":52,"col":60}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":52,"col":28},"end_pos":{"line":52,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":53,"col":40},"end_pos":{"line":53,"col":60}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":53,"col":28},"end_pos":{"line":53,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":54,"col":40},"end_pos":{"line":54,"col":60}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":54,"col":28},"end_pos":{"line":54,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":55,"col":40},"end_pos":{"line":55,"col":60}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":55,"col":28},"end_pos":{"line":55,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___5`","While typechecking the top-level declaration `[@@expect_failure] let uu___5`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":63,"col":40},"end_pos":{"line":63,"col":52}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":63,"col":28},"end_pos":{"line":63,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___6`","While typechecking the top-level declaration `[@@expect_failure] let uu___6`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":64,"col":40},"end_pos":{"line":64,"col":52}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":64,"col":28},"end_pos":{"line":64,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___6`","While typechecking the top-level declaration `[@@expect_failure] let uu___6`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":75,"col":40},"end_pos":{"line":75,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":75,"col":28},"end_pos":{"line":75,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___9`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":76,"col":40},"end_pos":{"line":76,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":76,"col":28},"end_pos":{"line":76,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___9`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":77,"col":40},"end_pos":{"line":77,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":77,"col":28},"end_pos":{"line":77,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___9`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":78,"col":40},"end_pos":{"line":78,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":78,"col":28},"end_pos":{"line":78,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___9`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":87,"col":40},"end_pos":{"line":87,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":87,"col":28},"end_pos":{"line":87,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":88,"col":40},"end_pos":{"line":88,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":88,"col":28},"end_pos":{"line":88,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":89,"col":40},"end_pos":{"line":89,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":89,"col":28},"end_pos":{"line":89,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":90,"col":40},"end_pos":{"line":90,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":90,"col":28},"end_pos":{"line":90,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":91,"col":40},"end_pos":{"line":91,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":91,"col":28},"end_pos":{"line":91,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug1997.fst","start_pos":{"line":92,"col":40},"end_pos":{"line":92,"col":50}},"use":{"file_name":"Bug1997.fst","start_pos":{"line":92,"col":28},"end_pos":{"line":92,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
 Module after type checking:
 module Bug1997
 Declarations: [
diff --git a/tests/error-messages/Bug1997.fst.output.expected b/tests/error-messages/Bug1997.fst.output.expected
index 47d8746956c..031a6bd20f8 100644
--- a/tests/error-messages/Bug1997.fst.output.expected
+++ b/tests/error-messages/Bug1997.fst.output.expected
@@ -160,180 +160,180 @@ let _ = FStar.Pervasives.assert_norm (Bug1997.n0 == Bug1997.n1)
 
 ]
 
-* Info at Bug1997.fst(13,27-13,38):
+* Info at Bug1997.fst:13.28-13.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(13,39-13,55)
+  - See also Bug1997.fst:13.40-13.56
 
-* Info at Bug1997.fst(21,27-21,38):
+* Info at Bug1997.fst:21.28-21.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(21,39-21,67)
+  - See also Bug1997.fst:21.40-21.68
 
-* Info at Bug1997.fst(29,27-29,38):
+* Info at Bug1997.fst:29.28-29.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(29,39-29,63)
+  - See also Bug1997.fst:29.40-29.64
 
-* Info at Bug1997.fst(38,27-38,38):
+* Info at Bug1997.fst:38.28-38.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(38,39-38,65)
+  - See also Bug1997.fst:38.40-38.66
 
-* Info at Bug1997.fst(39,27-39,38):
+* Info at Bug1997.fst:39.28-39.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(39,39-39,65)
+  - See also Bug1997.fst:39.40-39.66
 
-* Info at Bug1997.fst(40,27-40,38):
+* Info at Bug1997.fst:40.28-40.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(40,39-40,65)
+  - See also Bug1997.fst:40.40-40.66
 
-* Info at Bug1997.fst(41,27-41,38):
+* Info at Bug1997.fst:41.28-41.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(41,39-41,65)
+  - See also Bug1997.fst:41.40-41.66
 
-* Info at Bug1997.fst(42,27-42,38):
+* Info at Bug1997.fst:42.28-42.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(42,39-42,65)
+  - See also Bug1997.fst:42.40-42.66
 
-* Info at Bug1997.fst(51,27-51,38):
+* Info at Bug1997.fst:51.28-51.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(51,39-51,59)
+  - See also Bug1997.fst:51.40-51.60
 
-* Info at Bug1997.fst(52,27-52,38):
+* Info at Bug1997.fst:52.28-52.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(52,39-52,59)
+  - See also Bug1997.fst:52.40-52.60
 
-* Info at Bug1997.fst(53,27-53,38):
+* Info at Bug1997.fst:53.28-53.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(53,39-53,59)
+  - See also Bug1997.fst:53.40-53.60
 
-* Info at Bug1997.fst(54,27-54,38):
+* Info at Bug1997.fst:54.28-54.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(54,39-54,59)
+  - See also Bug1997.fst:54.40-54.60
 
-* Info at Bug1997.fst(55,27-55,38):
+* Info at Bug1997.fst:55.28-55.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(55,39-55,59)
+  - See also Bug1997.fst:55.40-55.60
 
-* Info at Bug1997.fst(63,27-63,38):
+* Info at Bug1997.fst:63.28-63.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(63,39-63,51)
+  - See also Bug1997.fst:63.40-63.52
 
-* Info at Bug1997.fst(64,27-64,38):
+* Info at Bug1997.fst:64.28-64.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(64,39-64,51)
+  - See also Bug1997.fst:64.40-64.52
 
-* Info at Bug1997.fst(75,27-75,38):
+* Info at Bug1997.fst:75.28-75.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(75,39-75,49)
+  - See also Bug1997.fst:75.40-75.50
 
-* Info at Bug1997.fst(76,27-76,38):
+* Info at Bug1997.fst:76.28-76.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(76,39-76,49)
+  - See also Bug1997.fst:76.40-76.50
 
-* Info at Bug1997.fst(77,27-77,38):
+* Info at Bug1997.fst:77.28-77.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(77,39-77,49)
+  - See also Bug1997.fst:77.40-77.50
 
-* Info at Bug1997.fst(78,27-78,38):
+* Info at Bug1997.fst:78.28-78.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(78,39-78,49)
+  - See also Bug1997.fst:78.40-78.50
 
-* Info at Bug1997.fst(87,27-87,38):
+* Info at Bug1997.fst:87.28-87.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(87,39-87,49)
+  - See also Bug1997.fst:87.40-87.50
 
-* Info at Bug1997.fst(88,27-88,38):
+* Info at Bug1997.fst:88.28-88.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(88,39-88,49)
+  - See also Bug1997.fst:88.40-88.50
 
-* Info at Bug1997.fst(89,27-89,38):
+* Info at Bug1997.fst:89.28-89.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(89,39-89,49)
+  - See also Bug1997.fst:89.40-89.50
 
-* Info at Bug1997.fst(90,27-90,38):
+* Info at Bug1997.fst:90.28-90.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(90,39-90,49)
+  - See also Bug1997.fst:90.40-90.50
 
-* Info at Bug1997.fst(91,27-91,38):
+* Info at Bug1997.fst:91.28-91.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(91,39-91,49)
+  - See also Bug1997.fst:91.40-91.50
 
-* Info at Bug1997.fst(92,27-92,38):
+* Info at Bug1997.fst:92.28-92.39:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug1997.fst(92,39-92,49)
+  - See also Bug1997.fst:92.40-92.50
 
 Module after type checking:
 module Bug1997
diff --git a/tests/error-messages/Bug2010.fst.json_output.expected b/tests/error-messages/Bug2010.fst.json_output.expected
index 2e9c60bcf3b..c66765805ee 100644
--- a/tests/error-messages/Bug2010.fst.json_output.expected
+++ b/tests/error-messages/Bug2010.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Failed to resolve implicit argument ?12\nof type Prims.nat\nintroduced for user-provided implicit term at Bug2010.fst(6,66-6,67)"],"level":"Info","range":{"def":{"file_name":"Bug2010.fst","start_pos":{"line":6,"col":66},"end_pos":{"line":6,"col":67}},"use":{"file_name":"Bug2010.fst","start_pos":{"line":6,"col":66},"end_pos":{"line":6,"col":67}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let concat'`","While typechecking the top-level declaration `[@@expect_failure] let concat'`"]}
+{"msg":["Expected failure:","Failed to resolve implicit argument ?12\nof type Prims.nat\nintroduced for user-provided implicit term at Bug2010.fst:6.67-6.68"],"level":"Info","range":{"def":{"file_name":"Bug2010.fst","start_pos":{"line":6,"col":67},"end_pos":{"line":6,"col":68}},"use":{"file_name":"Bug2010.fst","start_pos":{"line":6,"col":67},"end_pos":{"line":6,"col":68}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let concat'`","While typechecking the top-level declaration `[@@expect_failure] let concat'`"]}
diff --git a/tests/error-messages/Bug2010.fst.output.expected b/tests/error-messages/Bug2010.fst.output.expected
index f5816964803..ca9dd3c67a3 100644
--- a/tests/error-messages/Bug2010.fst.output.expected
+++ b/tests/error-messages/Bug2010.fst.output.expected
@@ -1,6 +1,6 @@
-* Info at Bug2010.fst(6,66-6,67):
+* Info at Bug2010.fst:6.67-6.68:
   - Expected failure:
   - Failed to resolve implicit argument ?12
     of type Prims.nat
-    introduced for user-provided implicit term at Bug2010.fst(6,66-6,67)
+    introduced for user-provided implicit term at Bug2010.fst:6.67-6.68
 
diff --git a/tests/error-messages/Bug2021.fst.json_output.expected b/tests/error-messages/Bug2021.fst.json_output.expected
index 7279689f7be..1e4a496fc5d 100644
--- a/tests/error-messages/Bug2021.fst.json_output.expected
+++ b/tests/error-messages/Bug2021.fst.json_output.expected
@@ -1,6 +1,6 @@
-{"msg":["Expected failure:","Failed to resolve implicit argument ?2\nof type Type\nintroduced for user-provided implicit term at Bug2021.fst(5,15-5,16)"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":5,"col":15},"end_pos":{"line":5,"col":16}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":5,"col":15},"end_pos":{"line":5,"col":16}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
-{"msg":["Expected failure:","Failed to resolve implicit argument ?2\nof type Type\nintroduced for user-provided implicit term at Bug2021.fst(10,8-10,9)"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":10,"col":8},"end_pos":{"line":10,"col":9}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":10,"col":8},"end_pos":{"line":10,"col":9}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
-{"msg":["Expected failure:","Failed to resolve implicit argument ?5\nof type Type\nintroduced for user-provided implicit term at Bug2021.fst(16,12-16,13)"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":16,"col":12},"end_pos":{"line":16,"col":13}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":16,"col":12},"end_pos":{"line":16,"col":13}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
-{"msg":["Expected failure:","Failed to resolve implicit argument ?9\nof type Prims.int\nintroduced for Instantiating implicit argument 'x'"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":23,"col":11},"end_pos":{"line":23,"col":12}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":24,"col":13},"end_pos":{"line":24,"col":14}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
-{"msg":["Expected failure:","Failed to resolve implicit argument ?10\nof type Prims.int\nintroduced for Instantiating implicit argument 'x'"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":29,"col":11},"end_pos":{"line":30,"col":17}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":30,"col":13},"end_pos":{"line":30,"col":17}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test4`","While typechecking the top-level declaration `[@@expect_failure] let test4`"]}
-{"msg":["Expected failure:","Failed to resolve implicit argument ?13\nof type Prims.int\nintroduced for Instantiating implicit argument 'x'"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":35,"col":11},"end_pos":{"line":36,"col":17}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":36,"col":13},"end_pos":{"line":36,"col":17}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test5`","While typechecking the top-level declaration `[@@expect_failure] let test5`"]}
+{"msg":["Expected failure:","Failed to resolve implicit argument ?2\nof type Type\nintroduced for user-provided implicit term at Bug2021.fst:5.16-5.17"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":5,"col":16},"end_pos":{"line":5,"col":17}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":5,"col":16},"end_pos":{"line":5,"col":17}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
+{"msg":["Expected failure:","Failed to resolve implicit argument ?2\nof type Type\nintroduced for user-provided implicit term at Bug2021.fst:10.9-10.10"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":10,"col":9},"end_pos":{"line":10,"col":10}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":10,"col":9},"end_pos":{"line":10,"col":10}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
+{"msg":["Expected failure:","Failed to resolve implicit argument ?5\nof type Type\nintroduced for user-provided implicit term at Bug2021.fst:16.13-16.14"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":16,"col":13},"end_pos":{"line":16,"col":14}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":16,"col":13},"end_pos":{"line":16,"col":14}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
+{"msg":["Expected failure:","Failed to resolve implicit argument ?9\nof type Prims.int\nintroduced for Instantiating implicit argument 'x'"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":23,"col":12},"end_pos":{"line":23,"col":13}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":24,"col":14},"end_pos":{"line":24,"col":15}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
+{"msg":["Expected failure:","Failed to resolve implicit argument ?10\nof type Prims.int\nintroduced for Instantiating implicit argument 'x'"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":29,"col":12},"end_pos":{"line":30,"col":18}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":30,"col":14},"end_pos":{"line":30,"col":18}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test4`","While typechecking the top-level declaration `[@@expect_failure] let test4`"]}
+{"msg":["Expected failure:","Failed to resolve implicit argument ?13\nof type Prims.int\nintroduced for Instantiating implicit argument 'x'"],"level":"Info","range":{"def":{"file_name":"Bug2021.fst","start_pos":{"line":35,"col":12},"end_pos":{"line":36,"col":18}},"use":{"file_name":"Bug2021.fst","start_pos":{"line":36,"col":14},"end_pos":{"line":36,"col":18}}},"number":66,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test5`","While typechecking the top-level declaration `[@@expect_failure] let test5`"]}
diff --git a/tests/error-messages/Bug2021.fst.output.expected b/tests/error-messages/Bug2021.fst.output.expected
index 0acd3c9a6b8..25e6a2b6586 100644
--- a/tests/error-messages/Bug2021.fst.output.expected
+++ b/tests/error-messages/Bug2021.fst.output.expected
@@ -1,39 +1,39 @@
-* Info at Bug2021.fst(5,15-5,16):
+* Info at Bug2021.fst:5.16-5.17:
   - Expected failure:
   - Failed to resolve implicit argument ?2
     of type Type
-    introduced for user-provided implicit term at Bug2021.fst(5,15-5,16)
+    introduced for user-provided implicit term at Bug2021.fst:5.16-5.17
 
-* Info at Bug2021.fst(10,8-10,9):
+* Info at Bug2021.fst:10.9-10.10:
   - Expected failure:
   - Failed to resolve implicit argument ?2
     of type Type
-    introduced for user-provided implicit term at Bug2021.fst(10,8-10,9)
+    introduced for user-provided implicit term at Bug2021.fst:10.9-10.10
 
-* Info at Bug2021.fst(16,12-16,13):
+* Info at Bug2021.fst:16.13-16.14:
   - Expected failure:
   - Failed to resolve implicit argument ?5
     of type Type
-    introduced for user-provided implicit term at Bug2021.fst(16,12-16,13)
+    introduced for user-provided implicit term at Bug2021.fst:16.13-16.14
 
-* Info at Bug2021.fst(24,13-24,14):
+* Info at Bug2021.fst:24.14-24.15:
   - Expected failure:
   - Failed to resolve implicit argument ?9
     of type Prims.int
     introduced for Instantiating implicit argument 'x'
-  - See also Bug2021.fst(23,11-23,12)
+  - See also Bug2021.fst:23.12-23.13
 
-* Info at Bug2021.fst(30,13-30,17):
+* Info at Bug2021.fst:30.14-30.18:
   - Expected failure:
   - Failed to resolve implicit argument ?10
     of type Prims.int
     introduced for Instantiating implicit argument 'x'
-  - See also Bug2021.fst(29,11-30,17)
+  - See also Bug2021.fst:29.12-30.18
 
-* Info at Bug2021.fst(36,13-36,17):
+* Info at Bug2021.fst:36.14-36.18:
   - Expected failure:
   - Failed to resolve implicit argument ?13
     of type Prims.int
     introduced for Instantiating implicit argument 'x'
-  - See also Bug2021.fst(35,11-36,17)
+  - See also Bug2021.fst:35.12-36.18
 
diff --git a/tests/error-messages/Bug2245.fst.json_output.expected b/tests/error-messages/Bug2245.fst.json_output.expected
index ab8b5cdde84..f9c838c1a53 100644
--- a/tests/error-messages/Bug2245.fst.json_output.expected
+++ b/tests/error-messages/Bug2245.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Expected expression of type (Prims.int & Prims.int) & Prims.int\ngot expression a\nof type Prims.int & Prims.int & Prims.int"],"level":"Info","range":{"def":{"file_name":"Bug2245.fst","start_pos":{"line":6,"col":23},"end_pos":{"line":6,"col":24}},"use":{"file_name":"Bug2245.fst","start_pos":{"line":6,"col":23},"end_pos":{"line":6,"col":24}}},"number":189,"ctx":["While typechecking the top-level declaration `let b`","While typechecking the top-level declaration `[@@expect_failure] let b`"]}
+{"msg":["Expected failure:","Expected expression of type (Prims.int & Prims.int) & Prims.int\ngot expression a\nof type Prims.int & Prims.int & Prims.int"],"level":"Info","range":{"def":{"file_name":"Bug2245.fst","start_pos":{"line":6,"col":24},"end_pos":{"line":6,"col":25}},"use":{"file_name":"Bug2245.fst","start_pos":{"line":6,"col":24},"end_pos":{"line":6,"col":25}}},"number":189,"ctx":["While typechecking the top-level declaration `let b`","While typechecking the top-level declaration `[@@expect_failure] let b`"]}
diff --git a/tests/error-messages/Bug2245.fst.output.expected b/tests/error-messages/Bug2245.fst.output.expected
index 6ebf73673d6..d69fd16cdbd 100644
--- a/tests/error-messages/Bug2245.fst.output.expected
+++ b/tests/error-messages/Bug2245.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at Bug2245.fst(6,23-6,24):
+* Info at Bug2245.fst:6.24-6.25:
   - Expected failure:
   - Expected expression of type (Prims.int & Prims.int) & Prims.int
     got expression a
diff --git a/tests/error-messages/Bug2899.fst.json_output.expected b/tests/error-messages/Bug2899.fst.json_output.expected
index bdb1031e810..a162796d7f1 100644
--- a/tests/error-messages/Bug2899.fst.json_output.expected
+++ b/tests/error-messages/Bug2899.fst.json_output.expected
@@ -1,4 +1,4 @@
-{"msg":["Expected failure:","Tactic failed","Tactic got stuck!","Reduction stopped at: Prims.admit ()","The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?"],"level":"Info","range":{"def":{"file_name":"FStar.Tactics.Effect.fsti","start_pos":{"line":167,"col":48},"end_pos":{"line":167,"col":58}},"use":{"file_name":"Bug2899.fst","start_pos":{"line":7,"col":12},"end_pos":{"line":7,"col":18}}},"number":170,"ctx":["While preprocessing VC with a tactic","While checking for top-level effects","While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
-{"msg":["Expected failure:","Tactic failed","Tactic got stuck!","Reduction stopped at: Prims.admit ()","The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?"],"level":"Info","range":{"def":{"file_name":"FStar.Tactics.Effect.fsti","start_pos":{"line":167,"col":48},"end_pos":{"line":167,"col":58}},"use":{"file_name":"Bug2899.fst","start_pos":{"line":10,"col":12},"end_pos":{"line":10,"col":18}}},"number":170,"ctx":["While preprocessing VC with a tactic","While checking for top-level effects","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
-{"msg":["Expected failure:","Tactic failed","Tactic got stuck!","Reduction stopped at:\n  FStar.Stubs.Tactics.V2.Builtins.dump (Prims.admit ()) \"(((ref proofstate)))\"","The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?"],"level":"Info","range":{"def":{"file_name":"FStar.Tactics.Effect.fsti","start_pos":{"line":167,"col":48},"end_pos":{"line":167,"col":58}},"use":{"file_name":"Bug2899.fst","start_pos":{"line":13,"col":12},"end_pos":{"line":13,"col":18}}},"number":170,"ctx":["While preprocessing VC with a tactic","While checking for top-level effects","While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
-{"msg":["Expected failure:","Tactic failed","Tactic got stuck!","Reduction stopped at: reify (tac ()) \"(((ref proofstate)))\"",""],"level":"Info","range":{"def":{"file_name":"FStar.Tactics.Effect.fsti","start_pos":{"line":167,"col":48},"end_pos":{"line":167,"col":58}},"use":{"file_name":"Bug2899.fst","start_pos":{"line":17,"col":50},"end_pos":{"line":17,"col":66}}},"number":170,"ctx":["While preprocessing VC with a tactic","While typechecking the top-level declaration `let eval_tactic`","While typechecking the top-level declaration `[@@expect_failure] let eval_tactic`"]}
+{"msg":["Expected failure:","Tactic failed","Tactic got stuck!","Reduction stopped at: Prims.admit ()","The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?"],"level":"Info","range":{"def":{"file_name":"FStar.Tactics.Effect.fsti","start_pos":{"line":167,"col":49},"end_pos":{"line":167,"col":59}},"use":{"file_name":"Bug2899.fst","start_pos":{"line":7,"col":13},"end_pos":{"line":7,"col":19}}},"number":170,"ctx":["While preprocessing VC with a tactic","While checking for top-level effects","While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
+{"msg":["Expected failure:","Tactic failed","Tactic got stuck!","Reduction stopped at: Prims.admit ()","The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?"],"level":"Info","range":{"def":{"file_name":"FStar.Tactics.Effect.fsti","start_pos":{"line":167,"col":49},"end_pos":{"line":167,"col":59}},"use":{"file_name":"Bug2899.fst","start_pos":{"line":10,"col":13},"end_pos":{"line":10,"col":19}}},"number":170,"ctx":["While preprocessing VC with a tactic","While checking for top-level effects","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
+{"msg":["Expected failure:","Tactic failed","Tactic got stuck!","Reduction stopped at:\n  FStar.Stubs.Tactics.V2.Builtins.dump (Prims.admit ()) \"(((ref proofstate)))\"","The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?"],"level":"Info","range":{"def":{"file_name":"FStar.Tactics.Effect.fsti","start_pos":{"line":167,"col":49},"end_pos":{"line":167,"col":59}},"use":{"file_name":"Bug2899.fst","start_pos":{"line":13,"col":13},"end_pos":{"line":13,"col":19}}},"number":170,"ctx":["While preprocessing VC with a tactic","While checking for top-level effects","While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
+{"msg":["Expected failure:","Tactic failed","Tactic got stuck!","Reduction stopped at: reify (tac ()) \"(((ref proofstate)))\"",""],"level":"Info","range":{"def":{"file_name":"FStar.Tactics.Effect.fsti","start_pos":{"line":167,"col":49},"end_pos":{"line":167,"col":59}},"use":{"file_name":"Bug2899.fst","start_pos":{"line":17,"col":51},"end_pos":{"line":17,"col":67}}},"number":170,"ctx":["While preprocessing VC with a tactic","While typechecking the top-level declaration `let eval_tactic`","While typechecking the top-level declaration `[@@expect_failure] let eval_tactic`"]}
diff --git a/tests/error-messages/Bug2899.fst.output.expected b/tests/error-messages/Bug2899.fst.output.expected
index 18a82a1c9db..ba84bf97206 100644
--- a/tests/error-messages/Bug2899.fst.output.expected
+++ b/tests/error-messages/Bug2899.fst.output.expected
@@ -1,20 +1,20 @@
-* Info at Bug2899.fst(7,12-7,18):
+* Info at Bug2899.fst:7.13-7.19:
   - Expected failure:
   - Tactic failed
   - Tactic got stuck!
   - Reduction stopped at: Prims.admit ()
   - The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?
-  - See also FStar.Tactics.Effect.fsti(167,48-167,58)
+  - See also FStar.Tactics.Effect.fsti:167.49-167.59
 
-* Info at Bug2899.fst(10,12-10,18):
+* Info at Bug2899.fst:10.13-10.19:
   - Expected failure:
   - Tactic failed
   - Tactic got stuck!
   - Reduction stopped at: Prims.admit ()
   - The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?
-  - See also FStar.Tactics.Effect.fsti(167,48-167,58)
+  - See also FStar.Tactics.Effect.fsti:167.49-167.59
 
-* Info at Bug2899.fst(13,12-13,18):
+* Info at Bug2899.fst:13.13-13.19:
   - Expected failure:
   - Tactic failed
   - Tactic got stuck!
@@ -22,12 +22,12 @@
       FStar.Stubs.Tactics.V2.Builtins.dump (Prims.admit ())
         "(((ref proofstate)))"
   - The term contains an `admit`, which will not reduce. Did you mean `tadmit()`?
-  - See also FStar.Tactics.Effect.fsti(167,48-167,58)
+  - See also FStar.Tactics.Effect.fsti:167.49-167.59
 
-* Info at Bug2899.fst(17,50-17,66):
+* Info at Bug2899.fst:17.51-17.67:
   - Expected failure:
   - Tactic failed
   - Tactic got stuck!
   - Reduction stopped at: reify (tac ()) "(((ref proofstate)))"
-  - See also FStar.Tactics.Effect.fsti(167,48-167,58)
+  - See also FStar.Tactics.Effect.fsti:167.49-167.59
 
diff --git a/tests/error-messages/Bug2953.fst.json_output.expected b/tests/error-messages/Bug2953.fst.json_output.expected
index aac16903bba..ae02f8d8d15 100644
--- a/tests/error-messages/Bug2953.fst.json_output.expected
+++ b/tests/error-messages/Bug2953.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","When clauses are not yet supported in --verify mode; they will be some day"],"level":"Info","range":{"def":{"file_name":"Bug2953.fst","start_pos":{"line":14,"col":21},"end_pos":{"line":14,"col":31}},"use":{"file_name":"Bug2953.fst","start_pos":{"line":14,"col":21},"end_pos":{"line":14,"col":31}}},"number":236,"ctx":["While typechecking the top-level declaration `let open_view`","While typechecking the top-level declaration `[@@expect_failure] let open_view`"]}
+{"msg":["Expected failure:","When clauses are not yet supported in --verify mode; they will be some day"],"level":"Info","range":{"def":{"file_name":"Bug2953.fst","start_pos":{"line":14,"col":22},"end_pos":{"line":14,"col":32}},"use":{"file_name":"Bug2953.fst","start_pos":{"line":14,"col":22},"end_pos":{"line":14,"col":32}}},"number":236,"ctx":["While typechecking the top-level declaration `let open_view`","While typechecking the top-level declaration `[@@expect_failure] let open_view`"]}
diff --git a/tests/error-messages/Bug2953.fst.output.expected b/tests/error-messages/Bug2953.fst.output.expected
index f902ee33444..9fb40f883ae 100644
--- a/tests/error-messages/Bug2953.fst.output.expected
+++ b/tests/error-messages/Bug2953.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at Bug2953.fst(14,21-14,31):
+* Info at Bug2953.fst:14.22-14.32:
   - Expected failure:
   - When clauses are not yet supported in --verify mode; they will be some day
 
diff --git a/tests/error-messages/Bug2980.fst.json_output.expected b/tests/error-messages/Bug2980.fst.json_output.expected
index 9f1b096e37a..4368ae5df61 100644
--- a/tests/error-messages/Bug2980.fst.json_output.expected
+++ b/tests/error-messages/Bug2980.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Expected expression of type Type0\ngot expression Bug2980.t\nof type _: Prims.int -> Type0"],"level":"Info","range":{"def":{"file_name":"Bug2980.fst","start_pos":{"line":5,"col":4},"end_pos":{"line":5,"col":5}},"use":{"file_name":"Bug2980.fst","start_pos":{"line":5,"col":4},"end_pos":{"line":5,"col":5}}},"number":189,"ctx":["While typechecking the top-level declaration `type Bug2980.t`","While typechecking the top-level declaration `[@@expect_failure] type Bug2980.t`"]}
+{"msg":["Expected failure:","Expected expression of type Type0\ngot expression Bug2980.t\nof type _: Prims.int -> Type0"],"level":"Info","range":{"def":{"file_name":"Bug2980.fst","start_pos":{"line":5,"col":5},"end_pos":{"line":5,"col":6}},"use":{"file_name":"Bug2980.fst","start_pos":{"line":5,"col":5},"end_pos":{"line":5,"col":6}}},"number":189,"ctx":["While typechecking the top-level declaration `type Bug2980.t`","While typechecking the top-level declaration `[@@expect_failure] type Bug2980.t`"]}
diff --git a/tests/error-messages/Bug2980.fst.output.expected b/tests/error-messages/Bug2980.fst.output.expected
index b20551507ab..77cbdc06035 100644
--- a/tests/error-messages/Bug2980.fst.output.expected
+++ b/tests/error-messages/Bug2980.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at Bug2980.fst(5,4-5,5):
+* Info at Bug2980.fst:5.5-5.6:
   - Expected failure:
   - Expected expression of type Type0
     got expression Bug2980.t
diff --git a/tests/error-messages/Bug2981.fst.json_output.expected b/tests/error-messages/Bug2981.fst.json_output.expected
index 282b368e92b..f5cb0b0ad57 100644
--- a/tests/error-messages/Bug2981.fst.json_output.expected
+++ b/tests/error-messages/Bug2981.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Bound variable\n'g'\nescapes because of impure applications in the type of\n'check'","Add explicit let-bindings to avoid this"],"level":"Info","range":{"def":{"file_name":"Bug2981.fst","start_pos":{"line":10,"col":10},"end_pos":{"line":10,"col":27}},"use":{"file_name":"Bug2981.fst","start_pos":{"line":10,"col":10},"end_pos":{"line":10,"col":27}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
+{"msg":["Expected failure:","Bound variable\n'g'\nescapes because of impure applications in the type of\n'check'","Add explicit let-bindings to avoid this"],"level":"Info","range":{"def":{"file_name":"Bug2981.fst","start_pos":{"line":10,"col":11},"end_pos":{"line":10,"col":28}},"use":{"file_name":"Bug2981.fst","start_pos":{"line":10,"col":11},"end_pos":{"line":10,"col":28}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
diff --git a/tests/error-messages/Bug2981.fst.output.expected b/tests/error-messages/Bug2981.fst.output.expected
index ef64413cbbb..abd8a37a393 100644
--- a/tests/error-messages/Bug2981.fst.output.expected
+++ b/tests/error-messages/Bug2981.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at Bug2981.fst(10,10-10,27):
+* Info at Bug2981.fst:10.11-10.28:
   - Expected failure:
   - Bound variable
     'g'
diff --git a/tests/error-messages/Bug3102.fst.json_output.expected b/tests/error-messages/Bug3102.fst.json_output.expected
index b3036977f88..b7c021fe91f 100644
--- a/tests/error-messages/Bug3102.fst.json_output.expected
+++ b/tests/error-messages/Bug3102.fst.json_output.expected
@@ -1,6 +1,6 @@
-{"msg":["Expected failure:","Bound variable\n'e1'\nwould escape in the type of this letbinding","Add a type annotation that does not mention it"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":8,"col":17},"end_pos":{"line":10,"col":9}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":8,"col":17},"end_pos":{"line":10,"col":9}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let min`","While typechecking the top-level declaration `[@@expect_failure] let min`"]}
-{"msg":["Expected failure:","(*?u23*)_ g t1 t2 is not equal to the expected type e2"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":27}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":27}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
-{"msg":["Expected failure:","(*?u20*)_ is not equal to the expected type e2"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":29,"col":4},"end_pos":{"line":29,"col":27}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":29,"col":4},"end_pos":{"line":29,"col":27}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
-{"msg":["Expected failure:","Bound variable\n'e2'\nwould escape in the type of this letbinding","Add a type annotation that does not mention it"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":33,"col":29},"end_pos":{"line":35,"col":27}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":33,"col":29},"end_pos":{"line":35,"col":27}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
-{"msg":["Expected failure:","Bound variable\n'z'\nwould escape in the type of this letbinding","Add a type annotation that does not mention it"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":41,"col":16},"end_pos":{"line":43,"col":8}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":41,"col":16},"end_pos":{"line":43,"col":8}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let gg`","While typechecking the top-level declaration `[@@expect_failure] let gg`"]}
-{"msg":["Expected failure:","Bound variable\n'z'\nwould escape in the type of this letbinding","Add a type annotation that does not mention it"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":49,"col":16},"end_pos":{"line":51,"col":7}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":49,"col":16},"end_pos":{"line":51,"col":7}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let g`","While typechecking the top-level declaration `[@@expect_failure] let g`"]}
+{"msg":["Expected failure:","Bound variable\n'e1'\nwould escape in the type of this letbinding","Add a type annotation that does not mention it"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":8,"col":18},"end_pos":{"line":10,"col":10}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":8,"col":18},"end_pos":{"line":10,"col":10}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let min`","While typechecking the top-level declaration `[@@expect_failure] let min`"]}
+{"msg":["Expected failure:","(*?u23*)_ g t1 t2 is not equal to the expected type e2"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":28}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":28}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
+{"msg":["Expected failure:","(*?u20*)_ is not equal to the expected type e2"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":29,"col":5},"end_pos":{"line":29,"col":28}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":29,"col":5},"end_pos":{"line":29,"col":28}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
+{"msg":["Expected failure:","Bound variable\n'e2'\nwould escape in the type of this letbinding","Add a type annotation that does not mention it"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":33,"col":30},"end_pos":{"line":35,"col":28}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":33,"col":30},"end_pos":{"line":35,"col":28}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
+{"msg":["Expected failure:","Bound variable\n'z'\nwould escape in the type of this letbinding","Add a type annotation that does not mention it"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":41,"col":17},"end_pos":{"line":43,"col":9}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":41,"col":17},"end_pos":{"line":43,"col":9}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let gg`","While typechecking the top-level declaration `[@@expect_failure] let gg`"]}
+{"msg":["Expected failure:","Bound variable\n'z'\nwould escape in the type of this letbinding","Add a type annotation that does not mention it"],"level":"Info","range":{"def":{"file_name":"Bug3102.fst","start_pos":{"line":49,"col":17},"end_pos":{"line":51,"col":8}},"use":{"file_name":"Bug3102.fst","start_pos":{"line":49,"col":17},"end_pos":{"line":51,"col":8}}},"number":56,"ctx":["While checking for escaped variables","While typechecking the top-level declaration `let g`","While typechecking the top-level declaration `[@@expect_failure] let g`"]}
diff --git a/tests/error-messages/Bug3102.fst.output.expected b/tests/error-messages/Bug3102.fst.output.expected
index 88465f66aa8..f993c1245fe 100644
--- a/tests/error-messages/Bug3102.fst.output.expected
+++ b/tests/error-messages/Bug3102.fst.output.expected
@@ -1,27 +1,27 @@
-* Info at Bug3102.fst(8,17-10,9):
+* Info at Bug3102.fst:8.18-10.10:
   - Expected failure:
   - Bound variable 'e1' would escape in the type of this letbinding
   - Add a type annotation that does not mention it
 
-* Info at Bug3102.fst(23,4-23,27):
+* Info at Bug3102.fst:23.5-23.28:
   - Expected failure:
   - (*?u23*)_ g t1 t2 is not equal to the expected type e2
 
-* Info at Bug3102.fst(29,4-29,27):
+* Info at Bug3102.fst:29.5-29.28:
   - Expected failure:
   - (*?u20*)_ is not equal to the expected type e2
 
-* Info at Bug3102.fst(33,29-35,27):
+* Info at Bug3102.fst:33.30-35.28:
   - Expected failure:
   - Bound variable 'e2' would escape in the type of this letbinding
   - Add a type annotation that does not mention it
 
-* Info at Bug3102.fst(41,16-43,8):
+* Info at Bug3102.fst:41.17-43.9:
   - Expected failure:
   - Bound variable 'z' would escape in the type of this letbinding
   - Add a type annotation that does not mention it
 
-* Info at Bug3102.fst(49,16-51,7):
+* Info at Bug3102.fst:49.17-51.8:
   - Expected failure:
   - Bound variable 'z' would escape in the type of this letbinding
   - Add a type annotation that does not mention it
diff --git a/tests/error-messages/Bug3232b.fst.json_output.expected b/tests/error-messages/Bug3232b.fst.json_output.expected
index bf1f51447a9..6c7047cdeba 100644
--- a/tests/error-messages/Bug3232b.fst.json_output.expected
+++ b/tests/error-messages/Bug3232b.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Bug3232b.f\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Bug3232b.fst","start_pos":{"line":4,"col":4},"end_pos":{"line":4,"col":5}},"use":{"file_name":"Bug3232b.fst","start_pos":{"line":4,"col":4},"end_pos":{"line":4,"col":5}}},"number":240,"ctx":["While desugaring module Bug3232b"]}
-{"msg":["Expected failure:","Inconsistent qualifier annotations on\nBug3232b.f","Expected '[inline_for_extraction]'\ngot '[noextract, inline_for_extraction]'","","Only in definition: '[noextract]'"],"level":"Info","range":{"def":{"file_name":"Bug3232b.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}},"use":{"file_name":"Bug3232b.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}}},"number":93,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
-{"msg":["Missing definitions in module Bug3232b: f"],"level":"Warning","range":{"def":{"file_name":"Bug3232b.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}},"use":{"file_name":"Bug3232b.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}}},"number":240,"ctx":[]}
+{"msg":["Bug3232b.f\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Bug3232b.fst","start_pos":{"line":4,"col":5},"end_pos":{"line":4,"col":6}},"use":{"file_name":"Bug3232b.fst","start_pos":{"line":4,"col":5},"end_pos":{"line":4,"col":6}}},"number":240,"ctx":["While desugaring module Bug3232b"]}
+{"msg":["Expected failure:","Inconsistent qualifier annotations on\nBug3232b.f","Expected '[inline_for_extraction]'\ngot '[noextract, inline_for_extraction]'","","Only in definition: '[noextract]'"],"level":"Info","range":{"def":{"file_name":"Bug3232b.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}},"use":{"file_name":"Bug3232b.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}}},"number":93,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
+{"msg":["Missing definitions in module Bug3232b: f"],"level":"Warning","range":{"def":{"file_name":"Bug3232b.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}},"use":{"file_name":"Bug3232b.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/Bug3232b.fst.output.expected b/tests/error-messages/Bug3232b.fst.output.expected
index e07f27f5915..329ccf5ecc7 100644
--- a/tests/error-messages/Bug3232b.fst.output.expected
+++ b/tests/error-messages/Bug3232b.fst.output.expected
@@ -1,13 +1,13 @@
-* Warning 240 at Bug3232b.fst(4,4-4,5):
+* Warning 240 at Bug3232b.fst:4.5-4.6:
   - Bug3232b.f is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at Bug3232b.fst(8,0-8,12):
+* Info at Bug3232b.fst:8.1-8.13:
   - Expected failure:
   - Inconsistent qualifier annotations on Bug3232b.f
   - Expected '[inline_for_extraction]' got '[noextract, inline_for_extraction]'
   - Only in definition: '[noextract]'
 
-* Warning 240 at Bug3232b.fst(8,0-8,12):
+* Warning 240 at Bug3232b.fst:8.1-8.13:
   - Missing definitions in module Bug3232b: f
 
diff --git a/tests/error-messages/Bug3232c.fst.json_output.expected b/tests/error-messages/Bug3232c.fst.json_output.expected
index 92f6dd0a478..402d3d445cd 100644
--- a/tests/error-messages/Bug3232c.fst.json_output.expected
+++ b/tests/error-messages/Bug3232c.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Bug3232c.f\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Bug3232c.fst","start_pos":{"line":4,"col":4},"end_pos":{"line":4,"col":5}},"use":{"file_name":"Bug3232c.fst","start_pos":{"line":4,"col":4},"end_pos":{"line":4,"col":5}}},"number":240,"ctx":["While desugaring module Bug3232c"]}
-{"msg":["Expected failure:","Inconsistent qualifier annotations on\nBug3232c.f","Expected '[inline_for_extraction, noextract]'\ngot '[noextract]'","Only in declaration: '[inline_for_extraction]'",""],"level":"Info","range":{"def":{"file_name":"Bug3232c.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}},"use":{"file_name":"Bug3232c.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}}},"number":93,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
-{"msg":["Missing definitions in module Bug3232c: f"],"level":"Warning","range":{"def":{"file_name":"Bug3232c.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}},"use":{"file_name":"Bug3232c.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}}},"number":240,"ctx":[]}
+{"msg":["Bug3232c.f\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Bug3232c.fst","start_pos":{"line":4,"col":5},"end_pos":{"line":4,"col":6}},"use":{"file_name":"Bug3232c.fst","start_pos":{"line":4,"col":5},"end_pos":{"line":4,"col":6}}},"number":240,"ctx":["While desugaring module Bug3232c"]}
+{"msg":["Expected failure:","Inconsistent qualifier annotations on\nBug3232c.f","Expected '[inline_for_extraction, noextract]'\ngot '[noextract]'","Only in declaration: '[inline_for_extraction]'",""],"level":"Info","range":{"def":{"file_name":"Bug3232c.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}},"use":{"file_name":"Bug3232c.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}}},"number":93,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
+{"msg":["Missing definitions in module Bug3232c: f"],"level":"Warning","range":{"def":{"file_name":"Bug3232c.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}},"use":{"file_name":"Bug3232c.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/Bug3232c.fst.output.expected b/tests/error-messages/Bug3232c.fst.output.expected
index 677b2f1a47e..352d7727a34 100644
--- a/tests/error-messages/Bug3232c.fst.output.expected
+++ b/tests/error-messages/Bug3232c.fst.output.expected
@@ -1,13 +1,13 @@
-* Warning 240 at Bug3232c.fst(4,4-4,5):
+* Warning 240 at Bug3232c.fst:4.5-4.6:
   - Bug3232c.f is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at Bug3232c.fst(8,0-8,12):
+* Info at Bug3232c.fst:8.1-8.13:
   - Expected failure:
   - Inconsistent qualifier annotations on Bug3232c.f
   - Expected '[inline_for_extraction, noextract]' got '[noextract]'
   - Only in declaration: '[inline_for_extraction]'
 
-* Warning 240 at Bug3232c.fst(8,0-8,12):
+* Warning 240 at Bug3232c.fst:8.1-8.13:
   - Missing definitions in module Bug3232c: f
 
diff --git a/tests/error-messages/Bug3232d.fst.json_output.expected b/tests/error-messages/Bug3232d.fst.json_output.expected
index 027093c3a8e..0616c0a9dbb 100644
--- a/tests/error-messages/Bug3232d.fst.json_output.expected
+++ b/tests/error-messages/Bug3232d.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Bug3232d.f\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Bug3232d.fst","start_pos":{"line":4,"col":4},"end_pos":{"line":4,"col":5}},"use":{"file_name":"Bug3232d.fst","start_pos":{"line":4,"col":4},"end_pos":{"line":4,"col":5}}},"number":240,"ctx":["While desugaring module Bug3232d"]}
-{"msg":["Expected failure:","Inconsistent qualifier annotations on\nBug3232d.f","Expected '[inline_for_extraction]'\ngot '[noextract]'","Only in declaration: '[inline_for_extraction]'","Only in definition: '[noextract]'"],"level":"Info","range":{"def":{"file_name":"Bug3232d.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}},"use":{"file_name":"Bug3232d.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}}},"number":93,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
-{"msg":["Missing definitions in module Bug3232d: f"],"level":"Warning","range":{"def":{"file_name":"Bug3232d.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}},"use":{"file_name":"Bug3232d.fst","start_pos":{"line":8,"col":0},"end_pos":{"line":8,"col":12}}},"number":240,"ctx":[]}
+{"msg":["Bug3232d.f\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Bug3232d.fst","start_pos":{"line":4,"col":5},"end_pos":{"line":4,"col":6}},"use":{"file_name":"Bug3232d.fst","start_pos":{"line":4,"col":5},"end_pos":{"line":4,"col":6}}},"number":240,"ctx":["While desugaring module Bug3232d"]}
+{"msg":["Expected failure:","Inconsistent qualifier annotations on\nBug3232d.f","Expected '[inline_for_extraction]'\ngot '[noextract]'","Only in declaration: '[inline_for_extraction]'","Only in definition: '[noextract]'"],"level":"Info","range":{"def":{"file_name":"Bug3232d.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}},"use":{"file_name":"Bug3232d.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}}},"number":93,"ctx":["While typechecking the top-level declaration `let f`","While typechecking the top-level declaration `[@@expect_failure] let f`"]}
+{"msg":["Missing definitions in module Bug3232d: f"],"level":"Warning","range":{"def":{"file_name":"Bug3232d.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}},"use":{"file_name":"Bug3232d.fst","start_pos":{"line":8,"col":1},"end_pos":{"line":8,"col":13}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/Bug3232d.fst.output.expected b/tests/error-messages/Bug3232d.fst.output.expected
index 12c748b1dab..76e244f8d11 100644
--- a/tests/error-messages/Bug3232d.fst.output.expected
+++ b/tests/error-messages/Bug3232d.fst.output.expected
@@ -1,14 +1,14 @@
-* Warning 240 at Bug3232d.fst(4,4-4,5):
+* Warning 240 at Bug3232d.fst:4.5-4.6:
   - Bug3232d.f is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at Bug3232d.fst(8,0-8,12):
+* Info at Bug3232d.fst:8.1-8.13:
   - Expected failure:
   - Inconsistent qualifier annotations on Bug3232d.f
   - Expected '[inline_for_extraction]' got '[noextract]'
   - Only in declaration: '[inline_for_extraction]'
   - Only in definition: '[noextract]'
 
-* Warning 240 at Bug3232d.fst(8,0-8,12):
+* Warning 240 at Bug3232d.fst:8.1-8.13:
   - Missing definitions in module Bug3232d: f
 
diff --git a/tests/error-messages/Bug446.fst.json_output.expected b/tests/error-messages/Bug446.fst.json_output.expected
index 3ac2e20de0b..446e78a82b3 100644
--- a/tests/error-messages/Bug446.fst.json_output.expected
+++ b/tests/error-messages/Bug446.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Subtyping check failed","Expected type wP a\ngot type wP b","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug446.fst","start_pos":{"line":33,"col":55},"end_pos":{"line":33,"col":58}},"use":{"file_name":"Bug446.fst","start_pos":{"line":34,"col":59},"end_pos":{"line":34,"col":62}}},"number":19,"ctx":["While typechecking the top-level declaration `val Bug446.fails`","While typechecking the top-level declaration `[@@expect_failure] val Bug446.fails`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type wP a\ngot type wP b","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Bug446.fst","start_pos":{"line":33,"col":56},"end_pos":{"line":33,"col":59}},"use":{"file_name":"Bug446.fst","start_pos":{"line":34,"col":60},"end_pos":{"line":34,"col":63}}},"number":19,"ctx":["While typechecking the top-level declaration `val Bug446.fails`","While typechecking the top-level declaration `[@@expect_failure] val Bug446.fails`"]}
diff --git a/tests/error-messages/Bug446.fst.output.expected b/tests/error-messages/Bug446.fst.output.expected
index 9fc7b699f9c..4737908b683 100644
--- a/tests/error-messages/Bug446.fst.output.expected
+++ b/tests/error-messages/Bug446.fst.output.expected
@@ -1,8 +1,8 @@
-* Info at Bug446.fst(34,59-34,62):
+* Info at Bug446.fst:34.60-34.63:
   - Expected failure:
   - Subtyping check failed
   - Expected type wP a got type wP b
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Bug446.fst(33,55-33,58)
+  - See also Bug446.fst:33.56-33.59
 
diff --git a/tests/error-messages/Calc.fst.json_output.expected b/tests/error-messages/Calc.fst.json_output.expected
index b49aa16f225..8bee64fa9db 100644
--- a/tests/error-messages/Calc.fst.json_output.expected
+++ b/tests/error-messages/Calc.fst.json_output.expected
@@ -1,11 +1,11 @@
-{"msg":["Expected failure:","Could not prove that this calc-chain is compatible","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Calc.fsti","start_pos":{"line":47,"col":50},"end_pos":{"line":47,"col":55}},"use":{"file_name":"Calc.fst","start_pos":{"line":12,"col":2},"end_pos":{"line":12,"col":13}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_gt_lt_elab`","While typechecking the top-level declaration `[@@expect_failure] let test_gt_lt_elab`"]}
-{"msg":["Expected failure:","Could not prove that this calc-chain is compatible","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":22,"col":7},"end_pos":{"line":22,"col":11}},"use":{"file_name":"Calc.fst","start_pos":{"line":22,"col":2},"end_pos":{"line":28,"col":3}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_gt_lt`","While typechecking the top-level declaration `[@@expect_failure] let test_gt_lt`"]}
-{"msg":["Expected failure:","Could not prove that this calc-chain is compatible","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":33,"col":7},"end_pos":{"line":33,"col":10}},"use":{"file_name":"Calc.fst","start_pos":{"line":33,"col":2},"end_pos":{"line":35,"col":3}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_singl`","While typechecking the top-level declaration `[@@expect_failure] let test_singl`"]}
-{"msg":["Expected failure:","Could not prove that this calc-chain is compatible","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":40,"col":7},"end_pos":{"line":40,"col":10}},"use":{"file_name":"Calc.fst","start_pos":{"line":40,"col":2},"end_pos":{"line":44,"col":3}}},"number":19,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (1 == 2)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":51,"col":3},"end_pos":{"line":51,"col":5}},"use":{"file_name":"Calc.fst","start_pos":{"line":51,"col":6},"end_pos":{"line":51,"col":8}}},"number":19,"ctx":["While typechecking the top-level declaration `let fail1`","While typechecking the top-level declaration `[@@expect_failure] let fail1`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (2 == 3)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":65,"col":3},"end_pos":{"line":65,"col":5}},"use":{"file_name":"Calc.fst","start_pos":{"line":65,"col":6},"end_pos":{"line":65,"col":8}}},"number":19,"ctx":["While typechecking the top-level declaration `let fail2`","While typechecking the top-level declaration `[@@expect_failure] let fail2`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (3 == 4)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":79,"col":3},"end_pos":{"line":79,"col":5}},"use":{"file_name":"Calc.fst","start_pos":{"line":79,"col":6},"end_pos":{"line":79,"col":8}}},"number":19,"ctx":["While typechecking the top-level declaration `let fail3`","While typechecking the top-level declaration `[@@expect_failure] let fail3`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash q\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":91,"col":20},"end_pos":{"line":91,"col":21}},"use":{"file_name":"Calc.fst","start_pos":{"line":93,"col":42},"end_pos":{"line":93,"col":44}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_impl_elab`","While typechecking the top-level declaration `[@@expect_failure] let test_impl_elab`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash q\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":101,"col":4},"end_pos":{"line":101,"col":5}},"use":{"file_name":"Calc.fst","start_pos":{"line":100,"col":10},"end_pos":{"line":100,"col":12}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_impl`","While typechecking the top-level declaration `[@@expect_failure] let test_impl`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":105,"col":12},"end_pos":{"line":105,"col":17}},"use":{"file_name":"Calc.fst","start_pos":{"line":114,"col":17},"end_pos":{"line":114,"col":25}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_1763_elab`","While typechecking the top-level declaration `[@@expect_failure] let test_1763_elab`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":105,"col":12},"end_pos":{"line":105,"col":17}},"use":{"file_name":"Calc.fst","start_pos":{"line":121,"col":9},"end_pos":{"line":121,"col":17}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_1763`","While typechecking the top-level declaration `[@@expect_failure] let test_1763`"]}
+{"msg":["Expected failure:","Could not prove that this calc-chain is compatible","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Calc.fsti","start_pos":{"line":47,"col":51},"end_pos":{"line":47,"col":56}},"use":{"file_name":"Calc.fst","start_pos":{"line":12,"col":3},"end_pos":{"line":12,"col":14}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_gt_lt_elab`","While typechecking the top-level declaration `[@@expect_failure] let test_gt_lt_elab`"]}
+{"msg":["Expected failure:","Could not prove that this calc-chain is compatible","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":22,"col":8},"end_pos":{"line":22,"col":12}},"use":{"file_name":"Calc.fst","start_pos":{"line":22,"col":3},"end_pos":{"line":28,"col":4}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_gt_lt`","While typechecking the top-level declaration `[@@expect_failure] let test_gt_lt`"]}
+{"msg":["Expected failure:","Could not prove that this calc-chain is compatible","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":33,"col":8},"end_pos":{"line":33,"col":11}},"use":{"file_name":"Calc.fst","start_pos":{"line":33,"col":3},"end_pos":{"line":35,"col":4}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_singl`","While typechecking the top-level declaration `[@@expect_failure] let test_singl`"]}
+{"msg":["Expected failure:","Could not prove that this calc-chain is compatible","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":40,"col":8},"end_pos":{"line":40,"col":11}},"use":{"file_name":"Calc.fst","start_pos":{"line":40,"col":3},"end_pos":{"line":44,"col":4}}},"number":19,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (1 == 2)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":51,"col":4},"end_pos":{"line":51,"col":6}},"use":{"file_name":"Calc.fst","start_pos":{"line":51,"col":7},"end_pos":{"line":51,"col":9}}},"number":19,"ctx":["While typechecking the top-level declaration `let fail1`","While typechecking the top-level declaration `[@@expect_failure] let fail1`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (2 == 3)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":65,"col":4},"end_pos":{"line":65,"col":6}},"use":{"file_name":"Calc.fst","start_pos":{"line":65,"col":7},"end_pos":{"line":65,"col":9}}},"number":19,"ctx":["While typechecking the top-level declaration `let fail2`","While typechecking the top-level declaration `[@@expect_failure] let fail2`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (3 == 4)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":79,"col":4},"end_pos":{"line":79,"col":6}},"use":{"file_name":"Calc.fst","start_pos":{"line":79,"col":7},"end_pos":{"line":79,"col":9}}},"number":19,"ctx":["While typechecking the top-level declaration `let fail3`","While typechecking the top-level declaration `[@@expect_failure] let fail3`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash q\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":91,"col":21},"end_pos":{"line":91,"col":22}},"use":{"file_name":"Calc.fst","start_pos":{"line":93,"col":43},"end_pos":{"line":93,"col":45}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_impl_elab`","While typechecking the top-level declaration `[@@expect_failure] let test_impl_elab`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash q\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":101,"col":5},"end_pos":{"line":101,"col":6}},"use":{"file_name":"Calc.fst","start_pos":{"line":100,"col":11},"end_pos":{"line":100,"col":13}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_impl`","While typechecking the top-level declaration `[@@expect_failure] let test_impl`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":105,"col":13},"end_pos":{"line":105,"col":18}},"use":{"file_name":"Calc.fst","start_pos":{"line":114,"col":18},"end_pos":{"line":114,"col":26}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_1763_elab`","While typechecking the top-level declaration `[@@expect_failure] let test_1763_elab`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Calc.fst","start_pos":{"line":105,"col":13},"end_pos":{"line":105,"col":18}},"use":{"file_name":"Calc.fst","start_pos":{"line":121,"col":10},"end_pos":{"line":121,"col":18}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_1763`","While typechecking the top-level declaration `[@@expect_failure] let test_1763`"]}
diff --git a/tests/error-messages/Calc.fst.output.expected b/tests/error-messages/Calc.fst.output.expected
index 197e352959c..4a3031cc6af 100644
--- a/tests/error-messages/Calc.fst.output.expected
+++ b/tests/error-messages/Calc.fst.output.expected
@@ -1,82 +1,82 @@
-* Info at Calc.fst(12,2-12,13):
+* Info at Calc.fst:12.3-12.14:
   - Expected failure:
   - Could not prove that this calc-chain is compatible
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also FStar.Calc.fsti(47,50-47,55)
+  - See also FStar.Calc.fsti:47.51-47.56
 
-* Info at Calc.fst(22,2-28,3):
+* Info at Calc.fst:22.3-28.4:
   - Expected failure:
   - Could not prove that this calc-chain is compatible
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(22,7-22,11)
+  - See also Calc.fst:22.8-22.12
 
-* Info at Calc.fst(33,2-35,3):
+* Info at Calc.fst:33.3-35.4:
   - Expected failure:
   - Could not prove that this calc-chain is compatible
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(33,7-33,10)
+  - See also Calc.fst:33.8-33.11
 
-* Info at Calc.fst(40,2-44,3):
+* Info at Calc.fst:40.3-44.4:
   - Expected failure:
   - Could not prove that this calc-chain is compatible
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(40,7-40,10)
+  - See also Calc.fst:40.8-40.11
 
-* Info at Calc.fst(51,6-51,8):
+* Info at Calc.fst:51.7-51.9:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash (1 == 2) got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(51,3-51,5)
+  - See also Calc.fst:51.4-51.6
 
-* Info at Calc.fst(65,6-65,8):
+* Info at Calc.fst:65.7-65.9:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash (2 == 3) got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(65,3-65,5)
+  - See also Calc.fst:65.4-65.6
 
-* Info at Calc.fst(79,6-79,8):
+* Info at Calc.fst:79.7-79.9:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash (3 == 4) got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(79,3-79,5)
+  - See also Calc.fst:79.4-79.6
 
-* Info at Calc.fst(93,42-93,44):
+* Info at Calc.fst:93.43-93.45:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash q got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(91,20-91,21)
+  - See also Calc.fst:91.21-91.22
 
-* Info at Calc.fst(100,10-100,12):
+* Info at Calc.fst:100.11-100.13:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash q got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(101,4-101,5)
+  - See also Calc.fst:101.5-101.6
 
-* Info at Calc.fst(114,17-114,25):
+* Info at Calc.fst:114.18-114.26:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(105,12-105,17)
+  - See also Calc.fst:105.13-105.18
 
-* Info at Calc.fst(121,9-121,17):
+* Info at Calc.fst:121.10-121.18:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Calc.fst(105,12-105,17)
+  - See also Calc.fst:105.13-105.18
 
diff --git a/tests/error-messages/Coercions.fst.json_output.expected b/tests/error-messages/Coercions.fst.json_output.expected
index a19d4f6de4b..743f97385b5 100644
--- a/tests/error-messages/Coercions.fst.json_output.expected
+++ b/tests/error-messages/Coercions.fst.json_output.expected
@@ -1,7 +1,7 @@
-{"msg":["Expected failure:","Computed type Prims.int\nand effect GTot\nis not compatible with the annotated type Prims.int\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"Coercions.fst","start_pos":{"line":6,"col":38},"end_pos":{"line":6,"col":39}},"use":{"file_name":"Coercions.fst","start_pos":{"line":6,"col":38},"end_pos":{"line":6,"col":39}}},"number":34,"ctx":["While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
-{"msg":["Expected failure:","Computed type 'a\nand effect GTot\nis not compatible with the annotated type 'a\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"Coercions.fst","start_pos":{"line":19,"col":37},"end_pos":{"line":19,"col":38}},"use":{"file_name":"Coercions.fst","start_pos":{"line":19,"col":37},"end_pos":{"line":19,"col":38}}},"number":34,"ctx":["While typechecking the top-level declaration `let test0'`","While typechecking the top-level declaration `[@@expect_failure] let test0'`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"Coercions.fst","start_pos":{"line":71,"col":4},"end_pos":{"line":71,"col":8}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_literal_bad`","While typechecking the top-level declaration `[@@expect_failure] let test_literal_bad`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"Coercions.fst","start_pos":{"line":74,"col":49},"end_pos":{"line":74,"col":57}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_int_nat_1`","While typechecking the top-level declaration `[@@expect_failure] let test_int_nat_1`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"Coercions.fst","start_pos":{"line":76,"col":55},"end_pos":{"line":76,"col":56}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_int_nat_2`","While typechecking the top-level declaration `[@@expect_failure] let test_int_nat_2`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"Coercions.fst","start_pos":{"line":78,"col":50},"end_pos":{"line":78,"col":51}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_int_nat_1'`","While typechecking the top-level declaration `[@@expect_failure] let test_int_nat_1'`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"Coercions.fst","start_pos":{"line":80,"col":51},"end_pos":{"line":80,"col":52}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_int_nat_2'`","While typechecking the top-level declaration `[@@expect_failure] let test_int_nat_2'`"]}
+{"msg":["Expected failure:","Computed type Prims.int\nand effect GTot\nis not compatible with the annotated type Prims.int\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"Coercions.fst","start_pos":{"line":6,"col":39},"end_pos":{"line":6,"col":40}},"use":{"file_name":"Coercions.fst","start_pos":{"line":6,"col":39},"end_pos":{"line":6,"col":40}}},"number":34,"ctx":["While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
+{"msg":["Expected failure:","Computed type 'a\nand effect GTot\nis not compatible with the annotated type 'a\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"Coercions.fst","start_pos":{"line":19,"col":38},"end_pos":{"line":19,"col":39}},"use":{"file_name":"Coercions.fst","start_pos":{"line":19,"col":38},"end_pos":{"line":19,"col":39}}},"number":34,"ctx":["While typechecking the top-level declaration `let test0'`","While typechecking the top-level declaration `[@@expect_failure] let test0'`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"Coercions.fst","start_pos":{"line":71,"col":5},"end_pos":{"line":71,"col":9}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_literal_bad`","While typechecking the top-level declaration `[@@expect_failure] let test_literal_bad`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"Coercions.fst","start_pos":{"line":74,"col":50},"end_pos":{"line":74,"col":58}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_int_nat_1`","While typechecking the top-level declaration `[@@expect_failure] let test_int_nat_1`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"Coercions.fst","start_pos":{"line":76,"col":56},"end_pos":{"line":76,"col":57}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_int_nat_2`","While typechecking the top-level declaration `[@@expect_failure] let test_int_nat_2`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"Coercions.fst","start_pos":{"line":78,"col":51},"end_pos":{"line":78,"col":52}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_int_nat_1'`","While typechecking the top-level declaration `[@@expect_failure] let test_int_nat_1'`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"Coercions.fst","start_pos":{"line":80,"col":52},"end_pos":{"line":80,"col":53}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_int_nat_2'`","While typechecking the top-level declaration `[@@expect_failure] let test_int_nat_2'`"]}
diff --git a/tests/error-messages/Coercions.fst.output.expected b/tests/error-messages/Coercions.fst.output.expected
index 03da7753ae6..1498c539f8f 100644
--- a/tests/error-messages/Coercions.fst.output.expected
+++ b/tests/error-messages/Coercions.fst.output.expected
@@ -1,54 +1,54 @@
-* Info at Coercions.fst(6,38-6,39):
+* Info at Coercions.fst:6.39-6.40:
   - Expected failure:
   - Computed type Prims.int
     and effect GTot
     is not compatible with the annotated type Prims.int
     and effect Tot
 
-* Info at Coercions.fst(19,37-19,38):
+* Info at Coercions.fst:19.38-19.39:
   - Expected failure:
   - Computed type 'a
     and effect GTot
     is not compatible with the annotated type 'a
     and effect Tot
 
-* Info at Coercions.fst(71,4-71,8):
+* Info at Coercions.fst:71.5-71.9:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at Coercions.fst(74,49-74,57):
+* Info at Coercions.fst:74.50-74.58:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at Coercions.fst(76,55-76,56):
+* Info at Coercions.fst:76.56-76.57:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at Coercions.fst(78,50-78,51):
+* Info at Coercions.fst:78.51-78.52:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at Coercions.fst(80,51-80,52):
+* Info at Coercions.fst:80.52-80.53:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
diff --git a/tests/error-messages/DecreasesTypeWarning.fst.json_output.expected b/tests/error-messages/DecreasesTypeWarning.fst.json_output.expected
index a9ac2e175c0..85887ab9b16 100644
--- a/tests/error-messages/DecreasesTypeWarning.fst.json_output.expected
+++ b/tests/error-messages/DecreasesTypeWarning.fst.json_output.expected
@@ -1,2 +1,2 @@
-{"msg":["In the decreases clause for this function, the SMT solver may not be able to\nprove that the types of\n  xs (bound in DecreasesTypeWarning.fst(5,7-5,9))\nand x (bound in DecreasesTypeWarning.fst(3,11-3,12))\nare equal.","The type of the first term is: Prims.list Prims.nat","The type of the second term is: Prims.nat","If the proof fails, try annotating these with the same type."],"level":"Warning","range":{"def":{"file_name":"DecreasesTypeWarning.fst","start_pos":{"line":5,"col":7},"end_pos":{"line":5,"col":9}},"use":{"file_name":"DecreasesTypeWarning.fst","start_pos":{"line":5,"col":7},"end_pos":{"line":5,"col":9}}},"number":290,"ctx":["While typechecking the top-level declaration `let rec f and g`"]}
-{"msg":["In the decreases clause for this function, the SMT solver may not be able to\nprove that the types of\n  x (bound in DecreasesTypeWarning.fst(3,11-3,12))\nand xs (bound in DecreasesTypeWarning.fst(5,7-5,9))\nare equal.","The type of the first term is: Prims.nat","The type of the second term is: Prims.list Prims.nat","If the proof fails, try annotating these with the same type."],"level":"Warning","range":{"def":{"file_name":"DecreasesTypeWarning.fst","start_pos":{"line":3,"col":11},"end_pos":{"line":3,"col":12}},"use":{"file_name":"DecreasesTypeWarning.fst","start_pos":{"line":3,"col":11},"end_pos":{"line":3,"col":12}}},"number":290,"ctx":["While typechecking the top-level declaration `let rec f and g`"]}
+{"msg":["In the decreases clause for this function, the SMT solver may not be able to\nprove that the types of\n  xs (bound in DecreasesTypeWarning.fst:5.8-5.10)\nand x (bound in DecreasesTypeWarning.fst:3.12-3.13)\nare equal.","The type of the first term is: Prims.list Prims.nat","The type of the second term is: Prims.nat","If the proof fails, try annotating these with the same type."],"level":"Warning","range":{"def":{"file_name":"DecreasesTypeWarning.fst","start_pos":{"line":5,"col":8},"end_pos":{"line":5,"col":10}},"use":{"file_name":"DecreasesTypeWarning.fst","start_pos":{"line":5,"col":8},"end_pos":{"line":5,"col":10}}},"number":290,"ctx":["While typechecking the top-level declaration `let rec f and g`"]}
+{"msg":["In the decreases clause for this function, the SMT solver may not be able to\nprove that the types of\n  x (bound in DecreasesTypeWarning.fst:3.12-3.13)\nand xs (bound in DecreasesTypeWarning.fst:5.8-5.10)\nare equal.","The type of the first term is: Prims.nat","The type of the second term is: Prims.list Prims.nat","If the proof fails, try annotating these with the same type."],"level":"Warning","range":{"def":{"file_name":"DecreasesTypeWarning.fst","start_pos":{"line":3,"col":12},"end_pos":{"line":3,"col":13}},"use":{"file_name":"DecreasesTypeWarning.fst","start_pos":{"line":3,"col":12},"end_pos":{"line":3,"col":13}}},"number":290,"ctx":["While typechecking the top-level declaration `let rec f and g`"]}
diff --git a/tests/error-messages/DecreasesTypeWarning.fst.output.expected b/tests/error-messages/DecreasesTypeWarning.fst.output.expected
index a103886aebc..77901c84b70 100644
--- a/tests/error-messages/DecreasesTypeWarning.fst.output.expected
+++ b/tests/error-messages/DecreasesTypeWarning.fst.output.expected
@@ -1,18 +1,18 @@
-* Warning 290 at DecreasesTypeWarning.fst(5,7-5,9):
+* Warning 290 at DecreasesTypeWarning.fst:5.8-5.10:
   - In the decreases clause for this function, the SMT solver may not be able to
     prove that the types of
-      xs (bound in DecreasesTypeWarning.fst(5,7-5,9))
-    and x (bound in DecreasesTypeWarning.fst(3,11-3,12))
+      xs (bound in DecreasesTypeWarning.fst:5.8-5.10)
+    and x (bound in DecreasesTypeWarning.fst:3.12-3.13)
     are equal.
   - The type of the first term is: Prims.list Prims.nat
   - The type of the second term is: Prims.nat
   - If the proof fails, try annotating these with the same type.
 
-* Warning 290 at DecreasesTypeWarning.fst(3,11-3,12):
+* Warning 290 at DecreasesTypeWarning.fst:3.12-3.13:
   - In the decreases clause for this function, the SMT solver may not be able to
     prove that the types of
-      x (bound in DecreasesTypeWarning.fst(3,11-3,12))
-    and xs (bound in DecreasesTypeWarning.fst(5,7-5,9))
+      x (bound in DecreasesTypeWarning.fst:3.12-3.13)
+    and xs (bound in DecreasesTypeWarning.fst:5.8-5.10)
     are equal.
   - The type of the first term is: Prims.nat
   - The type of the second term is: Prims.list Prims.nat
diff --git a/tests/error-messages/DesugarOrder.fst.json_output.expected b/tests/error-messages/DesugarOrder.fst.json_output.expected
index b5b50783261..6bf7b612563 100644
--- a/tests/error-messages/DesugarOrder.fst.json_output.expected
+++ b/tests/error-messages/DesugarOrder.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Identifier not found: a",""],"level":"Info","range":{"def":{"file_name":"DesugarOrder.fst","start_pos":{"line":7,"col":12},"end_pos":{"line":7,"col":13}},"use":{"file_name":"DesugarOrder.fst","start_pos":{"line":7,"col":12},"end_pos":{"line":7,"col":13}}},"number":72,"ctx":["While desugaring module DesugarOrder"]}
+{"msg":["Expected failure:","Identifier not found: a",""],"level":"Info","range":{"def":{"file_name":"DesugarOrder.fst","start_pos":{"line":7,"col":13},"end_pos":{"line":7,"col":14}},"use":{"file_name":"DesugarOrder.fst","start_pos":{"line":7,"col":13},"end_pos":{"line":7,"col":14}}},"number":72,"ctx":["While desugaring module DesugarOrder"]}
diff --git a/tests/error-messages/DesugarOrder.fst.output.expected b/tests/error-messages/DesugarOrder.fst.output.expected
index f7692876122..954b4e15e80 100644
--- a/tests/error-messages/DesugarOrder.fst.output.expected
+++ b/tests/error-messages/DesugarOrder.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at DesugarOrder.fst(7,12-7,13):
+* Info at DesugarOrder.fst:7.13-7.14:
   - Expected failure:
   - Identifier not found: a
 
diff --git a/tests/error-messages/Erasable.fst.json_output.expected b/tests/error-messages/Erasable.fst.json_output.expected
index efa7eca3d94..ce377374409 100644
--- a/tests/error-messages/Erasable.fst.json_output.expected
+++ b/tests/error-messages/Erasable.fst.json_output.expected
@@ -1,9 +1,9 @@
-{"msg":["Erasable.e_nat_3\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":56,"col":4},"end_pos":{"line":56,"col":11}},"use":{"file_name":"Erasable.fst","start_pos":{"line":56,"col":4},"end_pos":{"line":56,"col":11}}},"number":240,"ctx":["While desugaring module Erasable"]}
-{"msg":["Erasable.e_nat_2\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":49,"col":4},"end_pos":{"line":49,"col":11}},"use":{"file_name":"Erasable.fst","start_pos":{"line":49,"col":4},"end_pos":{"line":49,"col":11}}},"number":240,"ctx":["While desugaring module Erasable"]}
-{"msg":["Expected failure:","Incompatible attributes and qualifiers: erasable types do not support decidable\nequality and must be marked `noeq`."],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":6,"col":0},"end_pos":{"line":8,"col":17}},"use":{"file_name":"Erasable.fst","start_pos":{"line":6,"col":0},"end_pos":{"line":8,"col":17}}},"number":162,"ctx":["While typechecking the top-level declaration `type Erasable.t0`","While typechecking the top-level declaration `[@@expect_failure] type Erasable.t0`"]}
-{"msg":["Expected failure:","Computed type Prims.int\nand effect Prims.GHOST\nis not compatible with the annotated type Prims.int\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":18,"col":2},"end_pos":{"line":20,"col":15}},"use":{"file_name":"Erasable.fst","start_pos":{"line":18,"col":2},"end_pos":{"line":20,"col":15}}},"number":34,"ctx":["While typechecking the top-level declaration `let test0_fail`","While typechecking the top-level declaration `[@@expect_failure] let test0_fail`"]}
-{"msg":["Expected failure:","Computed type Prims.int\nand effect GTot\nis not compatible with the annotated type Prims.int\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":28,"col":42},"end_pos":{"line":28,"col":52}},"use":{"file_name":"Erasable.fst","start_pos":{"line":28,"col":42},"end_pos":{"line":28,"col":52}}},"number":34,"ctx":["While typechecking the top-level declaration `let test1_fail`","While typechecking the top-level declaration `[@@expect_failure] let test1_fail`"]}
-{"msg":["Expected failure:","Illegal attribute: the `erasable` attribute is only permitted on inductive type\ndefinitions and abbreviations for non-informative types.","The term\nPrims.nat\nis considered informative."],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":41,"col":12},"end_pos":{"line":41,"col":15}},"use":{"file_name":"Erasable.fst","start_pos":{"line":41,"col":12},"end_pos":{"line":41,"col":15}}},"number":162,"ctx":["While typechecking the top-level declaration `let e_nat`","While typechecking the top-level declaration `[@@expect_failure] let e_nat`"]}
-{"msg":["Expected failure:","Mismatch of attributes between declaration and definition.","Declaration is marked `erasable` but the definition is not."],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":52,"col":0},"end_pos":{"line":52,"col":17}},"use":{"file_name":"Erasable.fst","start_pos":{"line":52,"col":0},"end_pos":{"line":52,"col":17}}},"number":162,"ctx":["While typechecking the top-level declaration `let e_nat_2`","While typechecking the top-level declaration `[@@expect_failure] let e_nat_2`"]}
-{"msg":["Expected failure:","Mismatch of attributes between declaration and definition.","Declaration is marked `erasable` but the definition is not."],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":59,"col":0},"end_pos":{"line":59,"col":29}},"use":{"file_name":"Erasable.fst","start_pos":{"line":59,"col":0},"end_pos":{"line":59,"col":29}}},"number":162,"ctx":["While typechecking the top-level declaration `type Erasable.e_nat_3`","While typechecking the top-level declaration `[@@expect_failure] type Erasable.e_nat_3`"]}
-{"msg":["Missing definitions in module Erasable:\n  e_nat_2\n  e_nat_3"],"level":"Warning","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":73,"col":0},"end_pos":{"line":73,"col":19}},"use":{"file_name":"Erasable.fst","start_pos":{"line":73,"col":0},"end_pos":{"line":73,"col":19}}},"number":240,"ctx":[]}
+{"msg":["Erasable.e_nat_3\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":56,"col":5},"end_pos":{"line":56,"col":12}},"use":{"file_name":"Erasable.fst","start_pos":{"line":56,"col":5},"end_pos":{"line":56,"col":12}}},"number":240,"ctx":["While desugaring module Erasable"]}
+{"msg":["Erasable.e_nat_2\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":49,"col":5},"end_pos":{"line":49,"col":12}},"use":{"file_name":"Erasable.fst","start_pos":{"line":49,"col":5},"end_pos":{"line":49,"col":12}}},"number":240,"ctx":["While desugaring module Erasable"]}
+{"msg":["Expected failure:","Incompatible attributes and qualifiers: erasable types do not support decidable\nequality and must be marked `noeq`."],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":6,"col":1},"end_pos":{"line":8,"col":18}},"use":{"file_name":"Erasable.fst","start_pos":{"line":6,"col":1},"end_pos":{"line":8,"col":18}}},"number":162,"ctx":["While typechecking the top-level declaration `type Erasable.t0`","While typechecking the top-level declaration `[@@expect_failure] type Erasable.t0`"]}
+{"msg":["Expected failure:","Computed type Prims.int\nand effect Prims.GHOST\nis not compatible with the annotated type Prims.int\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":18,"col":3},"end_pos":{"line":20,"col":16}},"use":{"file_name":"Erasable.fst","start_pos":{"line":18,"col":3},"end_pos":{"line":20,"col":16}}},"number":34,"ctx":["While typechecking the top-level declaration `let test0_fail`","While typechecking the top-level declaration `[@@expect_failure] let test0_fail`"]}
+{"msg":["Expected failure:","Computed type Prims.int\nand effect GTot\nis not compatible with the annotated type Prims.int\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":28,"col":43},"end_pos":{"line":28,"col":53}},"use":{"file_name":"Erasable.fst","start_pos":{"line":28,"col":43},"end_pos":{"line":28,"col":53}}},"number":34,"ctx":["While typechecking the top-level declaration `let test1_fail`","While typechecking the top-level declaration `[@@expect_failure] let test1_fail`"]}
+{"msg":["Expected failure:","Illegal attribute: the `erasable` attribute is only permitted on inductive type\ndefinitions and abbreviations for non-informative types.","The term\nPrims.nat\nis considered informative."],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":41,"col":13},"end_pos":{"line":41,"col":16}},"use":{"file_name":"Erasable.fst","start_pos":{"line":41,"col":13},"end_pos":{"line":41,"col":16}}},"number":162,"ctx":["While typechecking the top-level declaration `let e_nat`","While typechecking the top-level declaration `[@@expect_failure] let e_nat`"]}
+{"msg":["Expected failure:","Mismatch of attributes between declaration and definition.","Declaration is marked `erasable` but the definition is not."],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":52,"col":1},"end_pos":{"line":52,"col":18}},"use":{"file_name":"Erasable.fst","start_pos":{"line":52,"col":1},"end_pos":{"line":52,"col":18}}},"number":162,"ctx":["While typechecking the top-level declaration `let e_nat_2`","While typechecking the top-level declaration `[@@expect_failure] let e_nat_2`"]}
+{"msg":["Expected failure:","Mismatch of attributes between declaration and definition.","Declaration is marked `erasable` but the definition is not."],"level":"Info","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":59,"col":1},"end_pos":{"line":59,"col":30}},"use":{"file_name":"Erasable.fst","start_pos":{"line":59,"col":1},"end_pos":{"line":59,"col":30}}},"number":162,"ctx":["While typechecking the top-level declaration `type Erasable.e_nat_3`","While typechecking the top-level declaration `[@@expect_failure] type Erasable.e_nat_3`"]}
+{"msg":["Missing definitions in module Erasable:\n  e_nat_2\n  e_nat_3"],"level":"Warning","range":{"def":{"file_name":"Erasable.fst","start_pos":{"line":73,"col":1},"end_pos":{"line":73,"col":20}},"use":{"file_name":"Erasable.fst","start_pos":{"line":73,"col":1},"end_pos":{"line":73,"col":20}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/Erasable.fst.output.expected b/tests/error-messages/Erasable.fst.output.expected
index 1e3fcc5d249..3905f494d21 100644
--- a/tests/error-messages/Erasable.fst.output.expected
+++ b/tests/error-messages/Erasable.fst.output.expected
@@ -1,47 +1,47 @@
-* Warning 240 at Erasable.fst(56,4-56,11):
+* Warning 240 at Erasable.fst:56.5-56.12:
   - Erasable.e_nat_3 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at Erasable.fst(49,4-49,11):
+* Warning 240 at Erasable.fst:49.5-49.12:
   - Erasable.e_nat_2 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at Erasable.fst(6,0-8,17):
+* Info at Erasable.fst:6.1-8.18:
   - Expected failure:
   - Incompatible attributes and qualifiers: erasable types do not support
     decidable equality and must be marked `noeq`.
 
-* Info at Erasable.fst(18,2-20,15):
+* Info at Erasable.fst:18.3-20.16:
   - Expected failure:
   - Computed type Prims.int
     and effect Prims.GHOST
     is not compatible with the annotated type Prims.int
     and effect Tot
 
-* Info at Erasable.fst(28,42-28,52):
+* Info at Erasable.fst:28.43-28.53:
   - Expected failure:
   - Computed type Prims.int
     and effect GTot
     is not compatible with the annotated type Prims.int
     and effect Tot
 
-* Info at Erasable.fst(41,12-41,15):
+* Info at Erasable.fst:41.13-41.16:
   - Expected failure:
   - Illegal attribute: the `erasable` attribute is only permitted on inductive
     type definitions and abbreviations for non-informative types.
   - The term Prims.nat is considered informative.
 
-* Info at Erasable.fst(52,0-52,17):
+* Info at Erasable.fst:52.1-52.18:
   - Expected failure:
   - Mismatch of attributes between declaration and definition.
   - Declaration is marked `erasable` but the definition is not.
 
-* Info at Erasable.fst(59,0-59,29):
+* Info at Erasable.fst:59.1-59.30:
   - Expected failure:
   - Mismatch of attributes between declaration and definition.
   - Declaration is marked `erasable` but the definition is not.
 
-* Warning 240 at Erasable.fst(73,0-73,19):
+* Warning 240 at Erasable.fst:73.1-73.20:
   - Missing definitions in module Erasable:
       e_nat_2
       e_nat_3
diff --git a/tests/error-messages/ExpectFailure.fst.json_output.expected b/tests/error-messages/ExpectFailure.fst.json_output.expected
index 2f6d71f857f..f4e4d5c1fbf 100644
--- a/tests/error-messages/ExpectFailure.fst.json_output.expected
+++ b/tests/error-messages/ExpectFailure.fst.json_output.expected
@@ -1,7 +1,7 @@
-{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":20,"col":12},"end_pos":{"line":20,"col":15}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":20,"col":12},"end_pos":{"line":20,"col":15}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":24,"col":12},"end_pos":{"line":24,"col":15}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":24,"col":12},"end_pos":{"line":24,"col":15}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":28,"col":15},"end_pos":{"line":28,"col":20}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":28,"col":8},"end_pos":{"line":28,"col":14}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":30,"col":15},"end_pos":{"line":30,"col":20}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":30,"col":8},"end_pos":{"line":30,"col":14}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":43,"col":12},"end_pos":{"line":43,"col":15}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":43,"col":12},"end_pos":{"line":43,"col":15}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":50,"col":12},"end_pos":{"line":50,"col":15}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":50,"col":12},"end_pos":{"line":50,"col":15}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
-{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":61,"col":12},"end_pos":{"line":61,"col":15}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":61,"col":12},"end_pos":{"line":61,"col":15}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":20,"col":13},"end_pos":{"line":20,"col":16}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":20,"col":13},"end_pos":{"line":20,"col":16}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":24,"col":13},"end_pos":{"line":24,"col":16}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":24,"col":13},"end_pos":{"line":24,"col":16}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":28,"col":16},"end_pos":{"line":28,"col":21}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":28,"col":9},"end_pos":{"line":28,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":30,"col":16},"end_pos":{"line":30,"col":21}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":30,"col":9},"end_pos":{"line":30,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":43,"col":13},"end_pos":{"line":43,"col":16}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":43,"col":13},"end_pos":{"line":43,"col":16}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":50,"col":13},"end_pos":{"line":50,"col":16}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":50,"col":13},"end_pos":{"line":50,"col":16}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression 'a'\nof type FStar.Char.char"],"level":"Info","range":{"def":{"file_name":"ExpectFailure.fst","start_pos":{"line":61,"col":13},"end_pos":{"line":61,"col":16}},"use":{"file_name":"ExpectFailure.fst","start_pos":{"line":61,"col":13},"end_pos":{"line":61,"col":16}}},"number":189,"ctx":["While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
diff --git a/tests/error-messages/ExpectFailure.fst.output.expected b/tests/error-messages/ExpectFailure.fst.output.expected
index 060844ce790..fb4b63df047 100644
--- a/tests/error-messages/ExpectFailure.fst.output.expected
+++ b/tests/error-messages/ExpectFailure.fst.output.expected
@@ -1,42 +1,42 @@
-* Info at ExpectFailure.fst(20,12-20,15):
+* Info at ExpectFailure.fst:20.13-20.16:
   - Expected failure:
   - Expected expression of type Prims.int
     got expression 'a'
     of type FStar.Char.char
 
-* Info at ExpectFailure.fst(24,12-24,15):
+* Info at ExpectFailure.fst:24.13-24.16:
   - Expected failure:
   - Expected expression of type Prims.int
     got expression 'a'
     of type FStar.Char.char
 
-* Info at ExpectFailure.fst(28,8-28,14):
+* Info at ExpectFailure.fst:28.9-28.15:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also ExpectFailure.fst(28,15-28,20)
+  - See also ExpectFailure.fst:28.16-28.21
 
-* Info at ExpectFailure.fst(30,8-30,14):
+* Info at ExpectFailure.fst:30.9-30.15:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also ExpectFailure.fst(30,15-30,20)
+  - See also ExpectFailure.fst:30.16-30.21
 
-* Info at ExpectFailure.fst(43,12-43,15):
+* Info at ExpectFailure.fst:43.13-43.16:
   - Expected failure:
   - Expected expression of type Prims.int
     got expression 'a'
     of type FStar.Char.char
 
-* Info at ExpectFailure.fst(50,12-50,15):
+* Info at ExpectFailure.fst:50.13-50.16:
   - Expected failure:
   - Expected expression of type Prims.int
     got expression 'a'
     of type FStar.Char.char
 
-* Info at ExpectFailure.fst(61,12-61,15):
+* Info at ExpectFailure.fst:61.13-61.16:
   - Expected failure:
   - Expected expression of type Prims.int
     got expression 'a'
diff --git a/tests/error-messages/GhostImplicits.fst.json_output.expected b/tests/error-messages/GhostImplicits.fst.json_output.expected
index 0bc64dfa421..8f2cd3b752b 100644
--- a/tests/error-messages/GhostImplicits.fst.json_output.expected
+++ b/tests/error-messages/GhostImplicits.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Computed type Prims.nat\nand effect Prims.GHOST\nis not compatible with the annotated type Prims.nat\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"GhostImplicits.fst","start_pos":{"line":25,"col":54},"end_pos":{"line":25,"col":57}},"use":{"file_name":"GhostImplicits.fst","start_pos":{"line":25,"col":54},"end_pos":{"line":25,"col":57}}},"number":34,"ctx":["While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
+{"msg":["Expected failure:","Computed type Prims.nat\nand effect Prims.GHOST\nis not compatible with the annotated type Prims.nat\nand effect Tot"],"level":"Info","range":{"def":{"file_name":"GhostImplicits.fst","start_pos":{"line":25,"col":55},"end_pos":{"line":25,"col":58}},"use":{"file_name":"GhostImplicits.fst","start_pos":{"line":25,"col":55},"end_pos":{"line":25,"col":58}}},"number":34,"ctx":["While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
diff --git a/tests/error-messages/GhostImplicits.fst.output.expected b/tests/error-messages/GhostImplicits.fst.output.expected
index 9aa5e4b3002..9488a740af5 100644
--- a/tests/error-messages/GhostImplicits.fst.output.expected
+++ b/tests/error-messages/GhostImplicits.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at GhostImplicits.fst(25,54-25,57):
+* Info at GhostImplicits.fst:25.55-25.58:
   - Expected failure:
   - Computed type Prims.nat
     and effect Prims.GHOST
diff --git a/tests/error-messages/IfCond.fst.json_output.expected b/tests/error-messages/IfCond.fst.json_output.expected
index e20bc44c7f6..0fcc2116d36 100644
--- a/tests/error-messages/IfCond.fst.json_output.expected
+++ b/tests/error-messages/IfCond.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Expected expression of type Prims.bool\ngot expression 2\nof type Prims.int"],"level":"Info","range":{"def":{"file_name":"IfCond.fst","start_pos":{"line":4,"col":17},"end_pos":{"line":4,"col":18}},"use":{"file_name":"IfCond.fst","start_pos":{"line":4,"col":17},"end_pos":{"line":4,"col":18}}},"number":189,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.bool\ngot expression 2\nof type Prims.int"],"level":"Info","range":{"def":{"file_name":"IfCond.fst","start_pos":{"line":4,"col":18},"end_pos":{"line":4,"col":19}},"use":{"file_name":"IfCond.fst","start_pos":{"line":4,"col":18},"end_pos":{"line":4,"col":19}}},"number":189,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
diff --git a/tests/error-messages/IfCond.fst.output.expected b/tests/error-messages/IfCond.fst.output.expected
index 81906eecaab..c82902dbb7f 100644
--- a/tests/error-messages/IfCond.fst.output.expected
+++ b/tests/error-messages/IfCond.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at IfCond.fst(4,17-4,18):
+* Info at IfCond.fst:4.18-4.19:
   - Expected failure:
   - Expected expression of type Prims.bool got expression 2 of type Prims.int
 
diff --git a/tests/error-messages/IfThen.fst.json_output.expected b/tests/error-messages/IfThen.fst.json_output.expected
index 6042c8c72c9..d4c63ae8ea6 100644
--- a/tests/error-messages/IfThen.fst.json_output.expected
+++ b/tests/error-messages/IfThen.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression ()\nof type Prims.unit"],"level":"Info","range":{"def":{"file_name":"IfThen.fst","start_pos":{"line":5,"col":2},"end_pos":{"line":6,"col":6}},"use":{"file_name":"IfThen.fst","start_pos":{"line":5,"col":2},"end_pos":{"line":6,"col":6}}},"number":189,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
+{"msg":["Expected failure:","Expected expression of type Prims.int\ngot expression ()\nof type Prims.unit"],"level":"Info","range":{"def":{"file_name":"IfThen.fst","start_pos":{"line":5,"col":3},"end_pos":{"line":6,"col":7}},"use":{"file_name":"IfThen.fst","start_pos":{"line":5,"col":3},"end_pos":{"line":6,"col":7}}},"number":189,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
diff --git a/tests/error-messages/IfThen.fst.output.expected b/tests/error-messages/IfThen.fst.output.expected
index 6eee77e6bfe..7db2b43eeee 100644
--- a/tests/error-messages/IfThen.fst.output.expected
+++ b/tests/error-messages/IfThen.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at IfThen.fst(5,2-6,6):
+* Info at IfThen.fst:5.3-6.7:
   - Expected failure:
   - Expected expression of type Prims.int got expression () of type Prims.unit
 
diff --git a/tests/error-messages/IncoherentPatterns.fst.output.expected b/tests/error-messages/IncoherentPatterns.fst.output.expected
index a0bc08d7188..61b30bee744 100644
--- a/tests/error-messages/IncoherentPatterns.fst.output.expected
+++ b/tests/error-messages/IncoherentPatterns.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at IncoherentPatterns.fst(6,9-6,10):
+* Info at IncoherentPatterns.fst:6.10-6.11:
   - Expected failure:
   - Patterns in this match are incoherent.
   - Variable x is bound in some but not all patterns.
diff --git a/tests/error-messages/IncompatibleQuals.fst.json_output.expected b/tests/error-messages/IncompatibleQuals.fst.json_output.expected
index 442fbce38e1..33b0315ed40 100644
--- a/tests/error-messages/IncompatibleQuals.fst.json_output.expected
+++ b/tests/error-messages/IncompatibleQuals.fst.json_output.expected
@@ -1,4 +1,4 @@
-{"msg":["Expected failure:","Invalid qualifiers for declaration `val IncompatibleQuals.x`","Qualifiers\n`assume`\nand\n`inline_for_extraction`\nare not compatible."],"level":"Info","range":{"def":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":7,"col":0},"end_pos":{"line":7,"col":11}},"use":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":7,"col":0},"end_pos":{"line":7,"col":11}}},"number":162,"ctx":["While typechecking the top-level declaration `val IncompatibleQuals.x`","While typechecking the top-level declaration `[@@expect_failure] val IncompatibleQuals.x`"]}
-{"msg":["Expected failure:","Invalid qualifiers for declaration `val IncompatibleQuals.__proj__Mkr1__item__x`","Qualifiers\n`assume`\nand\n`inline_for_extraction`\nare not compatible."],"level":"Info","range":{"def":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":13,"col":1},"end_pos":{"line":13,"col":2}},"use":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":13,"col":1},"end_pos":{"line":13,"col":2}}},"number":162,"ctx":["While typechecking the top-level declaration `val IncompatibleQuals.__proj__Mkr1__item__x`","While typechecking the top-level declaration `[@@expect_failure] type IncompatibleQuals.r1`"]}
-{"msg":["Expected failure:","Invalid qualifiers for declaration `val IncompatibleQuals.uu___is_A1`","Qualifiers\n`assume`\nand\n`inline_for_extraction`\nare not compatible."],"level":"Info","range":{"def":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":33,"col":3},"end_pos":{"line":33,"col":5}},"use":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":33,"col":3},"end_pos":{"line":33,"col":5}}},"number":162,"ctx":["While typechecking the top-level declaration `val IncompatibleQuals.uu___is_A1`","While typechecking the top-level declaration `[@@expect_failure] type IncompatibleQuals.var1`"]}
-{"msg":["Expected failure:","Invalid qualifiers for declaration `let t`","Definitions cannot be marked `assume`."],"level":"Info","range":{"def":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":47,"col":5},"end_pos":{"line":47,"col":6}},"use":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":47,"col":5},"end_pos":{"line":47,"col":6}}},"number":162,"ctx":["While typechecking the top-level declaration `let t`","While typechecking the top-level declaration `[@@expect_failure] let t`"]}
+{"msg":["Expected failure:","Invalid qualifiers for declaration `val IncompatibleQuals.x`","Qualifiers\n`assume`\nand\n`inline_for_extraction`\nare not compatible."],"level":"Info","range":{"def":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":7,"col":1},"end_pos":{"line":7,"col":12}},"use":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":7,"col":1},"end_pos":{"line":7,"col":12}}},"number":162,"ctx":["While typechecking the top-level declaration `val IncompatibleQuals.x`","While typechecking the top-level declaration `[@@expect_failure] val IncompatibleQuals.x`"]}
+{"msg":["Expected failure:","Invalid qualifiers for declaration `val IncompatibleQuals.__proj__Mkr1__item__x`","Qualifiers\n`assume`\nand\n`inline_for_extraction`\nare not compatible."],"level":"Info","range":{"def":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":13,"col":2},"end_pos":{"line":13,"col":3}},"use":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":13,"col":2},"end_pos":{"line":13,"col":3}}},"number":162,"ctx":["While typechecking the top-level declaration `val IncompatibleQuals.__proj__Mkr1__item__x`","While typechecking the top-level declaration `[@@expect_failure] type IncompatibleQuals.r1`"]}
+{"msg":["Expected failure:","Invalid qualifiers for declaration `val IncompatibleQuals.uu___is_A1`","Qualifiers\n`assume`\nand\n`inline_for_extraction`\nare not compatible."],"level":"Info","range":{"def":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":33,"col":4},"end_pos":{"line":33,"col":6}},"use":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":33,"col":4},"end_pos":{"line":33,"col":6}}},"number":162,"ctx":["While typechecking the top-level declaration `val IncompatibleQuals.uu___is_A1`","While typechecking the top-level declaration `[@@expect_failure] type IncompatibleQuals.var1`"]}
+{"msg":["Expected failure:","Invalid qualifiers for declaration `let t`","Definitions cannot be marked `assume`."],"level":"Info","range":{"def":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":47,"col":6},"end_pos":{"line":47,"col":7}},"use":{"file_name":"IncompatibleQuals.fst","start_pos":{"line":47,"col":6},"end_pos":{"line":47,"col":7}}},"number":162,"ctx":["While typechecking the top-level declaration `let t`","While typechecking the top-level declaration `[@@expect_failure] let t`"]}
diff --git a/tests/error-messages/IncompatibleQuals.fst.output.expected b/tests/error-messages/IncompatibleQuals.fst.output.expected
index dd8600c8604..ee192ccec0f 100644
--- a/tests/error-messages/IncompatibleQuals.fst.output.expected
+++ b/tests/error-messages/IncompatibleQuals.fst.output.expected
@@ -1,20 +1,20 @@
-* Info at IncompatibleQuals.fst(7,0-7,11):
+* Info at IncompatibleQuals.fst:7.1-7.12:
   - Expected failure:
   - Invalid qualifiers for declaration `val IncompatibleQuals.x`
   - Qualifiers `assume` and `inline_for_extraction` are not compatible.
 
-* Info at IncompatibleQuals.fst(13,1-13,2):
+* Info at IncompatibleQuals.fst:13.2-13.3:
   - Expected failure:
   - Invalid qualifiers for declaration
       `val IncompatibleQuals.__proj__Mkr1__item__x`
   - Qualifiers `assume` and `inline_for_extraction` are not compatible.
 
-* Info at IncompatibleQuals.fst(33,3-33,5):
+* Info at IncompatibleQuals.fst:33.4-33.6:
   - Expected failure:
   - Invalid qualifiers for declaration `val IncompatibleQuals.uu___is_A1`
   - Qualifiers `assume` and `inline_for_extraction` are not compatible.
 
-* Info at IncompatibleQuals.fst(47,5-47,6):
+* Info at IncompatibleQuals.fst:47.6-47.7:
   - Expected failure:
   - Invalid qualifiers for declaration `let t`
   - Definitions cannot be marked `assume`.
diff --git a/tests/error-messages/Inference.fst.json_output.expected b/tests/error-messages/Inference.fst.json_output.expected
index 77e69c6120b..9652a1cb091 100644
--- a/tests/error-messages/Inference.fst.json_output.expected
+++ b/tests/error-messages/Inference.fst.json_output.expected
@@ -1,2 +1,2 @@
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.eqtype\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":81,"col":23},"end_pos":{"line":81,"col":30}},"use":{"file_name":"Inference.fst","start_pos":{"line":20,"col":14},"end_pos":{"line":20,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let alloc_fails`","While typechecking the top-level declaration `[@@expect_failure] let alloc_fails`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.eqtype\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":81,"col":23},"end_pos":{"line":81,"col":30}},"use":{"file_name":"Inference.fst","start_pos":{"line":20,"col":14},"end_pos":{"line":20,"col":15}}},"number":19,"ctx":["While typechecking the top-level declaration `let alloc_fails`","While typechecking the top-level declaration `[@@expect_failure] let alloc_fails`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.eqtype\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":81,"col":24},"end_pos":{"line":81,"col":31}},"use":{"file_name":"Inference.fst","start_pos":{"line":20,"col":15},"end_pos":{"line":20,"col":16}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let alloc_fails`","While typechecking the top-level declaration `[@@expect_failure] let alloc_fails`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.eqtype\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":81,"col":24},"end_pos":{"line":81,"col":31}},"use":{"file_name":"Inference.fst","start_pos":{"line":20,"col":15},"end_pos":{"line":20,"col":16}}},"number":19,"ctx":["While typechecking the top-level declaration `let alloc_fails`","While typechecking the top-level declaration `[@@expect_failure] let alloc_fails`"]}
diff --git a/tests/error-messages/Inference.fst.output.expected b/tests/error-messages/Inference.fst.output.expected
index e4a83690f8b..53c3d22bfa9 100644
--- a/tests/error-messages/Inference.fst.output.expected
+++ b/tests/error-messages/Inference.fst.output.expected
@@ -1,16 +1,16 @@
-* Info at Inference.fst(20,14-20,15):
+* Info at Inference.fst:20.15-20.16:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.eqtype got type Type0
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(81,23-81,30)
+  - See also Prims.fst:81.24-81.31
 
-* Info at Inference.fst(20,14-20,15):
+* Info at Inference.fst:20.15-20.16:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.eqtype got type Type0
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(81,23-81,30)
+  - See also Prims.fst:81.24-81.31
 
diff --git a/tests/error-messages/MetaRanges.fst.output.expected b/tests/error-messages/MetaRanges.fst.output.expected
index 3af2014de8c..7e07f625eb9 100644
--- a/tests/error-messages/MetaRanges.fst.output.expected
+++ b/tests/error-messages/MetaRanges.fst.output.expected
@@ -1,33 +1,33 @@
-* Info at MetaRanges.fst(9,15-9,16):
+* Info at MetaRanges.fst:9.16-9.17:
   - Expected failure:
   - Tactic failed
-  - See also MetaRanges.fst(9,8-9,13)
+  - See also MetaRanges.fst:9.9-9.14
 
-* Info at MetaRanges.fst(16,10-16,12):
+* Info at MetaRanges.fst:16.11-16.13:
   - Expected failure:
   - Tactic failed
   - Could not solve typeclass constraint `MetaRanges.deq Prims.int`
 
-* Info at MetaRanges.fst(19,9-19,11):
+* Info at MetaRanges.fst:19.10-19.12:
   - Expected failure:
   - Tactic failed
   - Could not solve typeclass constraint `MetaRanges.deq Prims.int`
 
-* Info at MetaRanges.fst(23,9-23,15):
+* Info at MetaRanges.fst:23.10-23.16:
   - Expected failure:
   - Tactic failed
   - Could not solve typeclass constraint `MetaRanges.deq Prims.int`
-  - See also MetaRanges.fst(23,9-23,11)
+  - See also MetaRanges.fst:23.10-23.12
 
-* Info at MetaRanges.fst(27,17-27,18):
+* Info at MetaRanges.fst:27.18-27.19:
   - Expected failure:
   - Tactic failed
   - Could not solve typeclass constraint `MetaRanges.deq Prims.int`
-  - See also MetaRanges.fst(27,9-27,11)
+  - See also MetaRanges.fst:27.10-27.12
 
-* Info at MetaRanges.fst(31,17-31,22):
+* Info at MetaRanges.fst:31.18-31.23:
   - Expected failure:
   - Tactic failed
   - Could not solve typeclass constraint `MetaRanges.deq Prims.int`
-  - See also MetaRanges.fst(3,33-3,38)
+  - See also MetaRanges.fst:3.34-3.39
 
diff --git a/tests/error-messages/NegativeTests.BST.fst.json_output.expected b/tests/error-messages/NegativeTests.BST.fst.json_output.expected
index 344b126fee2..c3522bcbe42 100644
--- a/tests/error-messages/NegativeTests.BST.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.BST.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Expected failure:","Subtyping check failed","Expected type\n  right:\n  FStar.Pervasives.Native.option (tree 2)\n    { 0 <= 1 /\\ 1 <= 2 /\\ None? right == (1 = 2) /\\\n      None? FStar.Pervasives.Native.None == (1 = 0) }\ngot type FStar.Pervasives.Native.option (tree 2)","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":27,"col":36},"end_pos":{"line":27,"col":58}},"use":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":37,"col":38},"end_pos":{"line":37,"col":42}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad_node_1`","While typechecking the top-level declaration `[@@expect_failure] let bad_node_1`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type\n  right:\n  FStar.Pervasives.Native.option (tree (l + 1))\n    { l <= l /\\ l <= l + 1 /\\ None? right == (l = l + 1) /\\\n      None? (FStar.Pervasives.Native.Some t) == (l = l) }\ngot type FStar.Pervasives.Native.option (tree (l + 1))","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":27,"col":36},"end_pos":{"line":27,"col":58}},"use":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":40,"col":61},"end_pos":{"line":40,"col":65}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad_node_2`","While typechecking the top-level declaration `[@@expect_failure] let bad_node_2`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type\n  right:\n  FStar.Pervasives.Native.option (tree (l + 1))\n    { l <= l + 1 /\\ l + 1 <= l + 1 /\\ None? right == (l + 1 = l + 1) /\\\n      None? (FStar.Pervasives.Native.Some t1) == (l + 1 = l) }\ngot type FStar.Pervasives.Native.option (tree (l + 1))","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":27,"col":36},"end_pos":{"line":27,"col":58}},"use":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":43,"col":78},"end_pos":{"line":43,"col":87}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad_node_3`","While typechecking the top-level declaration `[@@expect_failure] let bad_node_3`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type\n  right:\n  FStar.Pervasives.Native.option (tree 2)\n    { 0 <= 1 /\\ 1 <= 2 /\\ None? right == (1 = 2) /\\\n      None? FStar.Pervasives.Native.None == (1 = 0) }\ngot type FStar.Pervasives.Native.option (tree 2)","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":27,"col":37},"end_pos":{"line":27,"col":59}},"use":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":37,"col":39},"end_pos":{"line":37,"col":43}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad_node_1`","While typechecking the top-level declaration `[@@expect_failure] let bad_node_1`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type\n  right:\n  FStar.Pervasives.Native.option (tree (l + 1))\n    { l <= l /\\ l <= l + 1 /\\ None? right == (l = l + 1) /\\\n      None? (FStar.Pervasives.Native.Some t) == (l = l) }\ngot type FStar.Pervasives.Native.option (tree (l + 1))","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":27,"col":37},"end_pos":{"line":27,"col":59}},"use":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":40,"col":62},"end_pos":{"line":40,"col":66}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad_node_2`","While typechecking the top-level declaration `[@@expect_failure] let bad_node_2`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type\n  right:\n  FStar.Pervasives.Native.option (tree (l + 1))\n    { l <= l + 1 /\\ l + 1 <= l + 1 /\\ None? right == (l + 1 = l + 1) /\\\n      None? (FStar.Pervasives.Native.Some t1) == (l + 1 = l) }\ngot type FStar.Pervasives.Native.option (tree (l + 1))","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":27,"col":37},"end_pos":{"line":27,"col":59}},"use":{"file_name":"NegativeTests.BST.fst","start_pos":{"line":43,"col":79},"end_pos":{"line":43,"col":88}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad_node_3`","While typechecking the top-level declaration `[@@expect_failure] let bad_node_3`"]}
diff --git a/tests/error-messages/NegativeTests.BST.fst.output.expected b/tests/error-messages/NegativeTests.BST.fst.output.expected
index 50241b11a8c..8b7e654fee5 100644
--- a/tests/error-messages/NegativeTests.BST.fst.output.expected
+++ b/tests/error-messages/NegativeTests.BST.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at NegativeTests.BST.fst(37,38-37,42):
+* Info at NegativeTests.BST.fst:37.39-37.43:
   - Expected failure:
   - Subtyping check failed
   - Expected type
@@ -9,9 +9,9 @@
     got type FStar.Pervasives.Native.option (tree 2)
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.BST.fst(27,36-27,58)
+  - See also NegativeTests.BST.fst:27.37-27.59
 
-* Info at NegativeTests.BST.fst(40,61-40,65):
+* Info at NegativeTests.BST.fst:40.62-40.66:
   - Expected failure:
   - Subtyping check failed
   - Expected type
@@ -22,9 +22,9 @@
     got type FStar.Pervasives.Native.option (tree (l + 1))
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.BST.fst(27,36-27,58)
+  - See also NegativeTests.BST.fst:27.37-27.59
 
-* Info at NegativeTests.BST.fst(43,78-43,87):
+* Info at NegativeTests.BST.fst:43.79-43.88:
   - Expected failure:
   - Subtyping check failed
   - Expected type
@@ -35,5 +35,5 @@
     got type FStar.Pervasives.Native.option (tree (l + 1))
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.BST.fst(27,36-27,58)
+  - See also NegativeTests.BST.fst:27.37-27.59
 
diff --git a/tests/error-messages/NegativeTests.Bug260.fst.json_output.expected b/tests/error-messages/NegativeTests.Bug260.fst.json_output.expected
index 2f475fda7d0..3a9ee0ef845 100644
--- a/tests/error-messages/NegativeTests.Bug260.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.Bug260.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["NegativeTests.Bug260.bad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":7}},"use":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":7}}},"number":240,"ctx":["While desugaring module NegativeTests.Bug260"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type validity (S (S t))\ngot type validity (S t)","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":23,"col":37},"end_pos":{"line":26,"col":9}},"use":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":26,"col":12},"end_pos":{"line":26,"col":19}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad`","While typechecking the top-level declaration `[@@expect_failure] let bad`"]}
-{"msg":["Missing definitions in module NegativeTests.Bug260: bad"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":36,"col":0},"end_pos":{"line":36,"col":34}},"use":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":36,"col":0},"end_pos":{"line":36,"col":34}}},"number":240,"ctx":[]}
+{"msg":["NegativeTests.Bug260.bad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":8}},"use":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":8}}},"number":240,"ctx":["While desugaring module NegativeTests.Bug260"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type validity (S (S t))\ngot type validity (S t)","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":23,"col":38},"end_pos":{"line":26,"col":10}},"use":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":26,"col":13},"end_pos":{"line":26,"col":20}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad`","While typechecking the top-level declaration `[@@expect_failure] let bad`"]}
+{"msg":["Missing definitions in module NegativeTests.Bug260: bad"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":36,"col":1},"end_pos":{"line":36,"col":35}},"use":{"file_name":"NegativeTests.Bug260.fst","start_pos":{"line":36,"col":1},"end_pos":{"line":36,"col":35}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/NegativeTests.Bug260.fst.output.expected b/tests/error-messages/NegativeTests.Bug260.fst.output.expected
index a33ee810f36..fe39153a42e 100644
--- a/tests/error-messages/NegativeTests.Bug260.fst.output.expected
+++ b/tests/error-messages/NegativeTests.Bug260.fst.output.expected
@@ -1,15 +1,15 @@
-* Warning 240 at NegativeTests.Bug260.fst(23,4-23,7):
+* Warning 240 at NegativeTests.Bug260.fst:23.5-23.8:
   - NegativeTests.Bug260.bad is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at NegativeTests.Bug260.fst(26,12-26,19):
+* Info at NegativeTests.Bug260.fst:26.13-26.20:
   - Expected failure:
   - Subtyping check failed
   - Expected type validity (S (S t)) got type validity (S t)
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Bug260.fst(23,37-26,9)
+  - See also NegativeTests.Bug260.fst:23.38-26.10
 
-* Warning 240 at NegativeTests.Bug260.fst(36,0-36,34):
+* Warning 240 at NegativeTests.Bug260.fst:36.1-36.35:
   - Missing definitions in module NegativeTests.Bug260: bad
 
diff --git a/tests/error-messages/NegativeTests.False.fst.json_output.expected b/tests/error-messages/NegativeTests.False.fst.json_output.expected
index c7137be92d5..3bece7cc400 100644
--- a/tests/error-messages/NegativeTests.False.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.False.fst.json_output.expected
@@ -1,6 +1,6 @@
-{"msg":["NegativeTests.False.absurd\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":28,"col":4},"end_pos":{"line":28,"col":10}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":28,"col":4},"end_pos":{"line":28,"col":10}}},"number":240,"ctx":["While desugaring module NegativeTests.False"]}
-{"msg":["NegativeTests.False.bar\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":21,"col":4},"end_pos":{"line":21,"col":7}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":21,"col":4},"end_pos":{"line":21,"col":7}}},"number":240,"ctx":["While desugaring module NegativeTests.False"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":467,"col":77},"end_pos":{"line":467,"col":89}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":23,"col":13},"end_pos":{"line":23,"col":33}}},"number":19,"ctx":["While typechecking the top-level declaration `let bar`","While typechecking the top-level declaration `[@@expect_failure] let bar`"]}
-{"msg":["Expected failure:","Expected type Prims.l_True \\/ Prims.l_True\nbut Prims.Right Prims.T\nhas type Prims.sum Prims.l_True (*?u6*)_"],"level":"Info","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":42},"end_pos":{"line":30,"col":66}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":42},"end_pos":{"line":30,"col":66}}},"number":12,"ctx":["While typechecking the top-level declaration `let absurd`","While typechecking the top-level declaration `[@@expect_failure] let absurd`"]}
-{"msg":["Expected failure:","Expected type Prims.l_True \\/ Prims.l_True\nbut Prims.Left Prims.T\nhas type Prims.sum (*?u1*)_ Prims.l_True"],"level":"Info","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":18},"end_pos":{"line":30,"col":41}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":18},"end_pos":{"line":30,"col":41}}},"number":12,"ctx":["While typechecking the top-level declaration `let absurd`","While typechecking the top-level declaration `[@@expect_failure] let absurd`"]}
-{"msg":["Missing definitions in module NegativeTests.False:\n  absurd\n  bar"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":0},"end_pos":{"line":30,"col":66}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":0},"end_pos":{"line":30,"col":66}}},"number":240,"ctx":[]}
+{"msg":["NegativeTests.False.absurd\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":28,"col":5},"end_pos":{"line":28,"col":11}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":28,"col":5},"end_pos":{"line":28,"col":11}}},"number":240,"ctx":["While desugaring module NegativeTests.False"]}
+{"msg":["NegativeTests.False.bar\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":21,"col":5},"end_pos":{"line":21,"col":8}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":21,"col":5},"end_pos":{"line":21,"col":8}}},"number":240,"ctx":["While desugaring module NegativeTests.False"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":467,"col":78},"end_pos":{"line":467,"col":90}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":23,"col":14},"end_pos":{"line":23,"col":34}}},"number":19,"ctx":["While typechecking the top-level declaration `let bar`","While typechecking the top-level declaration `[@@expect_failure] let bar`"]}
+{"msg":["Expected failure:","Expected type Prims.l_True \\/ Prims.l_True\nbut Prims.Right Prims.T\nhas type Prims.sum Prims.l_True (*?u6*)_"],"level":"Info","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":43},"end_pos":{"line":30,"col":67}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":43},"end_pos":{"line":30,"col":67}}},"number":12,"ctx":["While typechecking the top-level declaration `let absurd`","While typechecking the top-level declaration `[@@expect_failure] let absurd`"]}
+{"msg":["Expected failure:","Expected type Prims.l_True \\/ Prims.l_True\nbut Prims.Left Prims.T\nhas type Prims.sum (*?u1*)_ Prims.l_True"],"level":"Info","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":19},"end_pos":{"line":30,"col":42}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":19},"end_pos":{"line":30,"col":42}}},"number":12,"ctx":["While typechecking the top-level declaration `let absurd`","While typechecking the top-level declaration `[@@expect_failure] let absurd`"]}
+{"msg":["Missing definitions in module NegativeTests.False:\n  absurd\n  bar"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":1},"end_pos":{"line":30,"col":67}},"use":{"file_name":"NegativeTests.False.fst","start_pos":{"line":30,"col":1},"end_pos":{"line":30,"col":67}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/NegativeTests.False.fst.output.expected b/tests/error-messages/NegativeTests.False.fst.output.expected
index 1458b930a56..8dae047e849 100644
--- a/tests/error-messages/NegativeTests.False.fst.output.expected
+++ b/tests/error-messages/NegativeTests.False.fst.output.expected
@@ -1,31 +1,31 @@
-* Warning 240 at NegativeTests.False.fst(28,4-28,10):
+* Warning 240 at NegativeTests.False.fst:28.5-28.11:
   - NegativeTests.False.absurd is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.False.fst(21,4-21,7):
+* Warning 240 at NegativeTests.False.fst:21.5-21.8:
   - NegativeTests.False.bar is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at NegativeTests.False.fst(23,13-23,33):
+* Info at NegativeTests.False.fst:23.14-23.34:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(467,77-467,89)
+  - See also Prims.fst:467.78-467.90
 
-* Info at NegativeTests.False.fst(30,42-30,66):
+* Info at NegativeTests.False.fst:30.43-30.67:
   - Expected failure:
   - Expected type Prims.l_True \/ Prims.l_True
     but Prims.Right Prims.T
     has type Prims.sum Prims.l_True (*?u6*)_
 
-* Info at NegativeTests.False.fst(30,18-30,41):
+* Info at NegativeTests.False.fst:30.19-30.42:
   - Expected failure:
   - Expected type Prims.l_True \/ Prims.l_True
     but Prims.Left Prims.T
     has type Prims.sum (*?u1*)_ Prims.l_True
 
-* Warning 240 at NegativeTests.False.fst(30,0-30,66):
+* Warning 240 at NegativeTests.False.fst:30.1-30.67:
   - Missing definitions in module NegativeTests.False:
       absurd
       bar
diff --git a/tests/error-messages/NegativeTests.Heap.fst.json_output.expected b/tests/error-messages/NegativeTests.Heap.fst.json_output.expected
index 0a176ff018f..b9f15a7802c 100644
--- a/tests/error-messages/NegativeTests.Heap.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.Heap.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Heap.fst","start_pos":{"line":26,"col":21},"end_pos":{"line":26,"col":54}},"use":{"file_name":"NegativeTests.Heap.fst","start_pos":{"line":26,"col":21},"end_pos":{"line":26,"col":54}}},"number":19,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Heap.fst","start_pos":{"line":26,"col":22},"end_pos":{"line":26,"col":55}},"use":{"file_name":"NegativeTests.Heap.fst","start_pos":{"line":26,"col":22},"end_pos":{"line":26,"col":55}}},"number":19,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
diff --git a/tests/error-messages/NegativeTests.Heap.fst.output.expected b/tests/error-messages/NegativeTests.Heap.fst.output.expected
index a229ef5ac5f..18c464566f3 100644
--- a/tests/error-messages/NegativeTests.Heap.fst.output.expected
+++ b/tests/error-messages/NegativeTests.Heap.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at NegativeTests.Heap.fst(26,21-26,54):
+* Info at NegativeTests.Heap.fst:26.22-26.55:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
diff --git a/tests/error-messages/NegativeTests.Neg.fst.json_output.expected b/tests/error-messages/NegativeTests.Neg.fst.json_output.expected
index 31cd99ea7e9..e17d6d7d409 100644
--- a/tests/error-messages/NegativeTests.Neg.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.Neg.fst.json_output.expected
@@ -1,17 +1,17 @@
-{"msg":["NegativeTests.Neg.bad_projector\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":44,"col":4},"end_pos":{"line":44,"col":17}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":44,"col":4},"end_pos":{"line":44,"col":17}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
-{"msg":["NegativeTests.Neg.test_postcondition_label\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":40,"col":4},"end_pos":{"line":40,"col":28}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":40,"col":4},"end_pos":{"line":40,"col":28}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
-{"msg":["NegativeTests.Neg.test_precondition_label\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":36,"col":4},"end_pos":{"line":36,"col":27}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":36,"col":4},"end_pos":{"line":36,"col":27}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
-{"msg":["NegativeTests.Neg.y\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":22,"col":4},"end_pos":{"line":22,"col":5}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":22,"col":4},"end_pos":{"line":22,"col":5}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
-{"msg":["NegativeTests.Neg.x\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":18,"col":4},"end_pos":{"line":18,"col":5}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":18,"col":4},"end_pos":{"line":18,"col":5}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":20,"col":8},"end_pos":{"line":20,"col":10}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let x`","While typechecking the top-level declaration `[@@expect_failure] let x`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":24,"col":8},"end_pos":{"line":24,"col":10}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let y`","While typechecking the top-level declaration `[@@expect_failure] let y`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":27,"col":30},"end_pos":{"line":27,"col":35}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":27,"col":30},"end_pos":{"line":27,"col":35}}},"number":19,"ctx":["While typechecking the top-level declaration `let assert_0_eq_1`","While typechecking the top-level declaration `[@@expect_failure] let assert_0_eq_1`"]}
-{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":30,"col":28},"end_pos":{"line":31,"col":15}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":30,"col":28},"end_pos":{"line":31,"col":15}}},"number":19,"ctx":["While typechecking the top-level declaration `let hd_int_inexhaustive`","While typechecking the top-level declaration `[@@expect_failure] let hd_int_inexhaustive`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":33,"col":44},"end_pos":{"line":33,"col":57}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":38,"col":32},"end_pos":{"line":38,"col":42}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_precondition_label`","While typechecking the top-level declaration `[@@expect_failure] let test_precondition_label`"]}
-{"msg":["Expected failure:","Could not prove post-condition","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":40,"col":83},"end_pos":{"line":40,"col":88}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":42,"col":33},"end_pos":{"line":42,"col":34}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_postcondition_label`","While typechecking the top-level declaration `[@@expect_failure] let test_postcondition_label`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type _: FStar.Pervasives.Native.option 'a {Some? _}\ngot type FStar.Pervasives.Native.option 'a","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Pervasives.Native.fst","start_pos":{"line":33,"col":4},"end_pos":{"line":33,"col":8}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":46,"col":30},"end_pos":{"line":46,"col":31}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad_projector`","While typechecking the top-level declaration `[@@expect_failure] let bad_projector`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type _: FStar.Pervasives.result Prims.int {V? _}\ngot type FStar.Pervasives.result Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Pervasives.fsti","start_pos":{"line":374,"col":4},"end_pos":{"line":374,"col":5}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":50,"col":45},"end_pos":{"line":50,"col":47}}},"number":19,"ctx":["While typechecking the top-level declaration `val NegativeTests.Neg.test`","While typechecking the top-level declaration `[@@expect_failure] val NegativeTests.Neg.test`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":55,"col":25},"end_pos":{"line":55,"col":26}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let h1`","While typechecking the top-level declaration `[@@expect_failure] let h1`"]}
-{"msg":["Expected failure:","Type annotation _: Type0{NegativeTests.Neg.phi_1510} for inductive\nNegativeTests.Neg.t is not Type or eqtype, or it is eqtype but contains\nnoeq/unopteq qualifiers"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":59,"col":5},"end_pos":{"line":59,"col":6}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":59,"col":5},"end_pos":{"line":59,"col":6}}},"number":309,"ctx":["While typechecking the top-level declaration `type NegativeTests.Neg.t`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Neg.t`"]}
-{"msg":["Expected failure:","Type annotation _: Type{Prims.l_False} for inductive NegativeTests.Neg.t2 is not\nType or eqtype, or it is eqtype but contains noeq/unopteq qualifiers"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":63,"col":5},"end_pos":{"line":63,"col":7}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":63,"col":5},"end_pos":{"line":63,"col":7}}},"number":309,"ctx":["While typechecking the top-level declaration `type NegativeTests.Neg.t2`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Neg.t2`"]}
-{"msg":["Missing definitions in module NegativeTests.Neg:\n  bad_projector\n  test_postcondition_label\n  test_precondition_label\n  x\n  y"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":63,"col":0},"end_pos":{"line":63,"col":32}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":63,"col":0},"end_pos":{"line":63,"col":32}}},"number":240,"ctx":[]}
+{"msg":["NegativeTests.Neg.bad_projector\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":44,"col":5},"end_pos":{"line":44,"col":18}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":44,"col":5},"end_pos":{"line":44,"col":18}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
+{"msg":["NegativeTests.Neg.test_postcondition_label\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":40,"col":5},"end_pos":{"line":40,"col":29}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":40,"col":5},"end_pos":{"line":40,"col":29}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
+{"msg":["NegativeTests.Neg.test_precondition_label\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":36,"col":5},"end_pos":{"line":36,"col":28}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":36,"col":5},"end_pos":{"line":36,"col":28}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
+{"msg":["NegativeTests.Neg.y\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":22,"col":5},"end_pos":{"line":22,"col":6}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":22,"col":5},"end_pos":{"line":22,"col":6}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
+{"msg":["NegativeTests.Neg.x\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":18,"col":5},"end_pos":{"line":18,"col":6}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":18,"col":5},"end_pos":{"line":18,"col":6}}},"number":240,"ctx":["While desugaring module NegativeTests.Neg"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":20,"col":9},"end_pos":{"line":20,"col":11}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let x`","While typechecking the top-level declaration `[@@expect_failure] let x`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":24,"col":9},"end_pos":{"line":24,"col":11}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let y`","While typechecking the top-level declaration `[@@expect_failure] let y`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":27,"col":31},"end_pos":{"line":27,"col":36}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":27,"col":31},"end_pos":{"line":27,"col":36}}},"number":19,"ctx":["While typechecking the top-level declaration `let assert_0_eq_1`","While typechecking the top-level declaration `[@@expect_failure] let assert_0_eq_1`"]}
+{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":30,"col":29},"end_pos":{"line":31,"col":16}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":30,"col":29},"end_pos":{"line":31,"col":16}}},"number":19,"ctx":["While typechecking the top-level declaration `let hd_int_inexhaustive`","While typechecking the top-level declaration `[@@expect_failure] let hd_int_inexhaustive`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":33,"col":45},"end_pos":{"line":33,"col":58}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":38,"col":33},"end_pos":{"line":38,"col":43}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_precondition_label`","While typechecking the top-level declaration `[@@expect_failure] let test_precondition_label`"]}
+{"msg":["Expected failure:","Could not prove post-condition","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":40,"col":84},"end_pos":{"line":40,"col":89}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":42,"col":34},"end_pos":{"line":42,"col":35}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_postcondition_label`","While typechecking the top-level declaration `[@@expect_failure] let test_postcondition_label`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type _: FStar.Pervasives.Native.option 'a {Some? _}\ngot type FStar.Pervasives.Native.option 'a","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Pervasives.Native.fst","start_pos":{"line":33,"col":5},"end_pos":{"line":33,"col":9}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":46,"col":31},"end_pos":{"line":46,"col":32}}},"number":19,"ctx":["While typechecking the top-level declaration `let bad_projector`","While typechecking the top-level declaration `[@@expect_failure] let bad_projector`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type _: FStar.Pervasives.result Prims.int {V? _}\ngot type FStar.Pervasives.result Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Pervasives.fsti","start_pos":{"line":374,"col":5},"end_pos":{"line":374,"col":6}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":50,"col":46},"end_pos":{"line":50,"col":48}}},"number":19,"ctx":["While typechecking the top-level declaration `val NegativeTests.Neg.test`","While typechecking the top-level declaration `[@@expect_failure] val NegativeTests.Neg.test`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":55,"col":26},"end_pos":{"line":55,"col":27}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let h1`","While typechecking the top-level declaration `[@@expect_failure] let h1`"]}
+{"msg":["Expected failure:","Type annotation _: Type0{NegativeTests.Neg.phi_1510} for inductive\nNegativeTests.Neg.t is not Type or eqtype, or it is eqtype but contains\nnoeq/unopteq qualifiers"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":59,"col":6},"end_pos":{"line":59,"col":7}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":59,"col":6},"end_pos":{"line":59,"col":7}}},"number":309,"ctx":["While typechecking the top-level declaration `type NegativeTests.Neg.t`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Neg.t`"]}
+{"msg":["Expected failure:","Type annotation _: Type{Prims.l_False} for inductive NegativeTests.Neg.t2 is not\nType or eqtype, or it is eqtype but contains noeq/unopteq qualifiers"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":63,"col":6},"end_pos":{"line":63,"col":8}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":63,"col":6},"end_pos":{"line":63,"col":8}}},"number":309,"ctx":["While typechecking the top-level declaration `type NegativeTests.Neg.t2`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Neg.t2`"]}
+{"msg":["Missing definitions in module NegativeTests.Neg:\n  bad_projector\n  test_postcondition_label\n  test_precondition_label\n  x\n  y"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":63,"col":1},"end_pos":{"line":63,"col":33}},"use":{"file_name":"NegativeTests.Neg.fst","start_pos":{"line":63,"col":1},"end_pos":{"line":63,"col":33}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/NegativeTests.Neg.fst.output.expected b/tests/error-messages/NegativeTests.Neg.fst.output.expected
index ac7b59c42d5..16213f2af4e 100644
--- a/tests/error-messages/NegativeTests.Neg.fst.output.expected
+++ b/tests/error-messages/NegativeTests.Neg.fst.output.expected
@@ -1,105 +1,105 @@
-* Warning 240 at NegativeTests.Neg.fst(44,4-44,17):
+* Warning 240 at NegativeTests.Neg.fst:44.5-44.18:
   - NegativeTests.Neg.bad_projector is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Neg.fst(40,4-40,28):
+* Warning 240 at NegativeTests.Neg.fst:40.5-40.29:
   - NegativeTests.Neg.test_postcondition_label
     is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Neg.fst(36,4-36,27):
+* Warning 240 at NegativeTests.Neg.fst:36.5-36.28:
   - NegativeTests.Neg.test_precondition_label
     is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Neg.fst(22,4-22,5):
+* Warning 240 at NegativeTests.Neg.fst:22.5-22.6:
   - NegativeTests.Neg.y is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Neg.fst(18,4-18,5):
+* Warning 240 at NegativeTests.Neg.fst:18.5-18.6:
   - NegativeTests.Neg.x is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at NegativeTests.Neg.fst(20,8-20,10):
+* Info at NegativeTests.Neg.fst:20.9-20.11:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at NegativeTests.Neg.fst(24,8-24,10):
+* Info at NegativeTests.Neg.fst:24.9-24.11:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at NegativeTests.Neg.fst(27,30-27,35):
+* Info at NegativeTests.Neg.fst:27.31-27.36:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Info at NegativeTests.Neg.fst(30,28-31,15):
+* Info at NegativeTests.Neg.fst:30.29-31.16:
   - Expected failure:
   - Patterns are incomplete
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Info at NegativeTests.Neg.fst(38,32-38,42):
+* Info at NegativeTests.Neg.fst:38.33-38.43:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Neg.fst(33,44-33,57)
+  - See also NegativeTests.Neg.fst:33.45-33.58
 
-* Info at NegativeTests.Neg.fst(42,33-42,34):
+* Info at NegativeTests.Neg.fst:42.34-42.35:
   - Expected failure:
   - Could not prove post-condition
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Neg.fst(40,83-40,88)
+  - See also NegativeTests.Neg.fst:40.84-40.89
 
-* Info at NegativeTests.Neg.fst(46,30-46,31):
+* Info at NegativeTests.Neg.fst:46.31-46.32:
   - Expected failure:
   - Subtyping check failed
   - Expected type _: FStar.Pervasives.Native.option 'a {Some? _}
     got type FStar.Pervasives.Native.option 'a
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also FStar.Pervasives.Native.fst(33,4-33,8)
+  - See also FStar.Pervasives.Native.fst:33.5-33.9
 
-* Info at NegativeTests.Neg.fst(50,45-50,47):
+* Info at NegativeTests.Neg.fst:50.46-50.48:
   - Expected failure:
   - Subtyping check failed
   - Expected type _: FStar.Pervasives.result Prims.int {V? _}
     got type FStar.Pervasives.result Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also FStar.Pervasives.fsti(374,4-374,5)
+  - See also FStar.Pervasives.fsti:374.5-374.6
 
-* Info at NegativeTests.Neg.fst(55,25-55,26):
+* Info at NegativeTests.Neg.fst:55.26-55.27:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at NegativeTests.Neg.fst(59,5-59,6):
+* Info at NegativeTests.Neg.fst:59.6-59.7:
   - Expected failure:
   - Type annotation _: Type0{NegativeTests.Neg.phi_1510} for inductive
     NegativeTests.Neg.t is not Type or eqtype, or it is eqtype but contains
     noeq/unopteq qualifiers
 
-* Info at NegativeTests.Neg.fst(63,5-63,7):
+* Info at NegativeTests.Neg.fst:63.6-63.8:
   - Expected failure:
   - Type annotation _: Type{Prims.l_False} for inductive NegativeTests.Neg.t2 is
     not Type or eqtype, or it is eqtype but contains noeq/unopteq qualifiers
 
-* Warning 240 at NegativeTests.Neg.fst(63,0-63,32):
+* Warning 240 at NegativeTests.Neg.fst:63.1-63.33:
   - Missing definitions in module NegativeTests.Neg:
       bad_projector
       test_postcondition_label
diff --git a/tests/error-messages/NegativeTests.Positivity.fst.json_output.expected b/tests/error-messages/NegativeTests.Positivity.fst.json_output.expected
index 892093b07a1..a4b85c0cfb0 100644
--- a/tests/error-messages/NegativeTests.Positivity.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.Positivity.fst.json_output.expected
@@ -1,6 +1,6 @@
-{"msg":["Expected failure:","Inductive type NegativeTests.Positivity.t1 does not satisfy the strict positivity condition"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":22,"col":10},"end_pos":{"line":22,"col":12}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":22,"col":10},"end_pos":{"line":22,"col":12}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t1`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t1`"]}
-{"msg":["Expected failure:","Inductive type NegativeTests.Positivity.t5 does not satisfy the strict positivity condition"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":37,"col":10},"end_pos":{"line":37,"col":12}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":37,"col":10},"end_pos":{"line":37,"col":12}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t5`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t5`"]}
-{"msg":["Expected failure:","Type NegativeTests.Positivity.t7 is not strictly positive since it instantiates a non-uniformly recursive parameter or index NegativeTests.Positivity.t7 of NegativeTests.Positivity.t6"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":49,"col":12},"end_pos":{"line":49,"col":14}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":49,"col":4},"end_pos":{"line":49,"col":7}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t7`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t7`"]}
-{"msg":["Expected failure:","Type NegativeTests.Positivity.t8 is not strictly positive since it instantiates a non-uniformly recursive parameter or index NegativeTests.Positivity.t8 of NegativeTests.Positivity.t6"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":54,"col":16},"end_pos":{"line":54,"col":18}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":54,"col":4},"end_pos":{"line":54,"col":7}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t8`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t8`"]}
-{"msg":["Expected failure:","Inductive type NegativeTests.Positivity.t10 does not satisfy the strict positivity condition"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":61,"col":10},"end_pos":{"line":61,"col":13}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":61,"col":10},"end_pos":{"line":61,"col":13}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t10`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t10`"]}
-{"msg":["Expected failure:","Inductive type NegativeTests.Positivity.t11 does not satisfy the strict positivity condition"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":66,"col":10},"end_pos":{"line":66,"col":13}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":66,"col":10},"end_pos":{"line":66,"col":13}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t11`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t11`"]}
+{"msg":["Expected failure:","Inductive type NegativeTests.Positivity.t1 does not satisfy the strict positivity condition"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":22,"col":11},"end_pos":{"line":22,"col":13}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":22,"col":11},"end_pos":{"line":22,"col":13}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t1`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t1`"]}
+{"msg":["Expected failure:","Inductive type NegativeTests.Positivity.t5 does not satisfy the strict positivity condition"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":37,"col":11},"end_pos":{"line":37,"col":13}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":37,"col":11},"end_pos":{"line":37,"col":13}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t5`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t5`"]}
+{"msg":["Expected failure:","Type NegativeTests.Positivity.t7 is not strictly positive since it instantiates a non-uniformly recursive parameter or index NegativeTests.Positivity.t7 of NegativeTests.Positivity.t6"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":49,"col":13},"end_pos":{"line":49,"col":15}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":49,"col":5},"end_pos":{"line":49,"col":8}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t7`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t7`"]}
+{"msg":["Expected failure:","Type NegativeTests.Positivity.t8 is not strictly positive since it instantiates a non-uniformly recursive parameter or index NegativeTests.Positivity.t8 of NegativeTests.Positivity.t6"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":54,"col":17},"end_pos":{"line":54,"col":19}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":54,"col":5},"end_pos":{"line":54,"col":8}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t8`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t8`"]}
+{"msg":["Expected failure:","Inductive type NegativeTests.Positivity.t10 does not satisfy the strict positivity condition"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":61,"col":11},"end_pos":{"line":61,"col":14}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":61,"col":11},"end_pos":{"line":61,"col":14}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t10`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t10`"]}
+{"msg":["Expected failure:","Inductive type NegativeTests.Positivity.t11 does not satisfy the strict positivity condition"],"level":"Info","range":{"def":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":66,"col":11},"end_pos":{"line":66,"col":14}},"use":{"file_name":"NegativeTests.Positivity.fst","start_pos":{"line":66,"col":11},"end_pos":{"line":66,"col":14}}},"number":3,"ctx":["While typechecking the top-level declaration `type NegativeTests.Positivity.t11`","While typechecking the top-level declaration `[@@expect_failure] type NegativeTests.Positivity.t11`"]}
diff --git a/tests/error-messages/NegativeTests.Positivity.fst.output.expected b/tests/error-messages/NegativeTests.Positivity.fst.output.expected
index a132687970e..c870deae9d5 100644
--- a/tests/error-messages/NegativeTests.Positivity.fst.output.expected
+++ b/tests/error-messages/NegativeTests.Positivity.fst.output.expected
@@ -1,26 +1,26 @@
-* Info at NegativeTests.Positivity.fst(22,10-22,12):
+* Info at NegativeTests.Positivity.fst:22.11-22.13:
   - Expected failure:
   - Inductive type NegativeTests.Positivity.t1 does not satisfy the strict positivity condition
 
-* Info at NegativeTests.Positivity.fst(37,10-37,12):
+* Info at NegativeTests.Positivity.fst:37.11-37.13:
   - Expected failure:
   - Inductive type NegativeTests.Positivity.t5 does not satisfy the strict positivity condition
 
-* Info at NegativeTests.Positivity.fst(49,4-49,7):
+* Info at NegativeTests.Positivity.fst:49.5-49.8:
   - Expected failure:
   - Type NegativeTests.Positivity.t7 is not strictly positive since it instantiates a non-uniformly recursive parameter or index NegativeTests.Positivity.t7 of NegativeTests.Positivity.t6
-  - See also NegativeTests.Positivity.fst(49,12-49,14)
+  - See also NegativeTests.Positivity.fst:49.13-49.15
 
-* Info at NegativeTests.Positivity.fst(54,4-54,7):
+* Info at NegativeTests.Positivity.fst:54.5-54.8:
   - Expected failure:
   - Type NegativeTests.Positivity.t8 is not strictly positive since it instantiates a non-uniformly recursive parameter or index NegativeTests.Positivity.t8 of NegativeTests.Positivity.t6
-  - See also NegativeTests.Positivity.fst(54,16-54,18)
+  - See also NegativeTests.Positivity.fst:54.17-54.19
 
-* Info at NegativeTests.Positivity.fst(61,10-61,13):
+* Info at NegativeTests.Positivity.fst:61.11-61.14:
   - Expected failure:
   - Inductive type NegativeTests.Positivity.t10 does not satisfy the strict positivity condition
 
-* Info at NegativeTests.Positivity.fst(66,10-66,13):
+* Info at NegativeTests.Positivity.fst:66.11-66.14:
   - Expected failure:
   - Inductive type NegativeTests.Positivity.t11 does not satisfy the strict positivity condition
 
diff --git a/tests/error-messages/NegativeTests.Set.fst.json_output.expected b/tests/error-messages/NegativeTests.Set.fst.json_output.expected
index a7ec868a4ed..c4e83c84bfc 100644
--- a/tests/error-messages/NegativeTests.Set.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.Set.fst.json_output.expected
@@ -1,7 +1,7 @@
-{"msg":["NegativeTests.Set.should_fail3\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":35,"col":4},"end_pos":{"line":35,"col":16}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":35,"col":4},"end_pos":{"line":35,"col":16}}},"number":240,"ctx":["While desugaring module NegativeTests.Set"]}
-{"msg":["NegativeTests.Set.should_fail2\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":30,"col":4},"end_pos":{"line":30,"col":16}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":30,"col":4},"end_pos":{"line":30,"col":16}}},"number":240,"ctx":["While desugaring module NegativeTests.Set"]}
-{"msg":["NegativeTests.Set.should_fail1\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":25,"col":4},"end_pos":{"line":25,"col":16}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":25,"col":4},"end_pos":{"line":25,"col":16}}},"number":240,"ctx":["While desugaring module NegativeTests.Set"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":28,"col":9},"end_pos":{"line":28,"col":30}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":28,"col":9},"end_pos":{"line":28,"col":30}}},"number":19,"ctx":["While typechecking the top-level declaration `let should_fail1`","While typechecking the top-level declaration `[@@expect_failure] let should_fail1`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":33,"col":9},"end_pos":{"line":33,"col":67}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":33,"col":9},"end_pos":{"line":33,"col":67}}},"number":19,"ctx":["While typechecking the top-level declaration `let should_fail2`","While typechecking the top-level declaration `[@@expect_failure] let should_fail2`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":38,"col":9},"end_pos":{"line":38,"col":52}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":38,"col":9},"end_pos":{"line":38,"col":52}}},"number":19,"ctx":["While typechecking the top-level declaration `let should_fail3`","While typechecking the top-level declaration `[@@expect_failure] let should_fail3`"]}
-{"msg":["Missing definitions in module NegativeTests.Set:\n  should_fail1\n  should_fail2\n  should_fail3"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":37,"col":0},"end_pos":{"line":38,"col":52}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":37,"col":0},"end_pos":{"line":38,"col":52}}},"number":240,"ctx":[]}
+{"msg":["NegativeTests.Set.should_fail3\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":35,"col":5},"end_pos":{"line":35,"col":17}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":35,"col":5},"end_pos":{"line":35,"col":17}}},"number":240,"ctx":["While desugaring module NegativeTests.Set"]}
+{"msg":["NegativeTests.Set.should_fail2\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":30,"col":5},"end_pos":{"line":30,"col":17}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":30,"col":5},"end_pos":{"line":30,"col":17}}},"number":240,"ctx":["While desugaring module NegativeTests.Set"]}
+{"msg":["NegativeTests.Set.should_fail1\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":25,"col":5},"end_pos":{"line":25,"col":17}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":25,"col":5},"end_pos":{"line":25,"col":17}}},"number":240,"ctx":["While desugaring module NegativeTests.Set"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":28,"col":10},"end_pos":{"line":28,"col":31}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":28,"col":10},"end_pos":{"line":28,"col":31}}},"number":19,"ctx":["While typechecking the top-level declaration `let should_fail1`","While typechecking the top-level declaration `[@@expect_failure] let should_fail1`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":33,"col":10},"end_pos":{"line":33,"col":68}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":33,"col":10},"end_pos":{"line":33,"col":68}}},"number":19,"ctx":["While typechecking the top-level declaration `let should_fail2`","While typechecking the top-level declaration `[@@expect_failure] let should_fail2`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":38,"col":10},"end_pos":{"line":38,"col":53}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":38,"col":10},"end_pos":{"line":38,"col":53}}},"number":19,"ctx":["While typechecking the top-level declaration `let should_fail3`","While typechecking the top-level declaration `[@@expect_failure] let should_fail3`"]}
+{"msg":["Missing definitions in module NegativeTests.Set:\n  should_fail1\n  should_fail2\n  should_fail3"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":37,"col":1},"end_pos":{"line":38,"col":53}},"use":{"file_name":"NegativeTests.Set.fst","start_pos":{"line":37,"col":1},"end_pos":{"line":38,"col":53}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/NegativeTests.Set.fst.output.expected b/tests/error-messages/NegativeTests.Set.fst.output.expected
index c4ef738e48c..c2372bee55c 100644
--- a/tests/error-messages/NegativeTests.Set.fst.output.expected
+++ b/tests/error-messages/NegativeTests.Set.fst.output.expected
@@ -1,34 +1,34 @@
-* Warning 240 at NegativeTests.Set.fst(35,4-35,16):
+* Warning 240 at NegativeTests.Set.fst:35.5-35.17:
   - NegativeTests.Set.should_fail3 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Set.fst(30,4-30,16):
+* Warning 240 at NegativeTests.Set.fst:30.5-30.17:
   - NegativeTests.Set.should_fail2 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Set.fst(25,4-25,16):
+* Warning 240 at NegativeTests.Set.fst:25.5-25.17:
   - NegativeTests.Set.should_fail1 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at NegativeTests.Set.fst(28,9-28,30):
+* Info at NegativeTests.Set.fst:28.10-28.31:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Info at NegativeTests.Set.fst(33,9-33,67):
+* Info at NegativeTests.Set.fst:33.10-33.68:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Info at NegativeTests.Set.fst(38,9-38,52):
+* Info at NegativeTests.Set.fst:38.10-38.53:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Warning 240 at NegativeTests.Set.fst(37,0-38,52):
+* Warning 240 at NegativeTests.Set.fst:37.1-38.53:
   - Missing definitions in module NegativeTests.Set:
       should_fail1
       should_fail2
diff --git a/tests/error-messages/NegativeTests.ShortCircuiting.fst.json_output.expected b/tests/error-messages/NegativeTests.ShortCircuiting.fst.json_output.expected
index d17484f6799..1d8bd8c3c45 100644
--- a/tests/error-messages/NegativeTests.ShortCircuiting.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.ShortCircuiting.fst.json_output.expected
@@ -1,5 +1,5 @@
-{"msg":["NegativeTests.ShortCircuiting.ff\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":6}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":6}}},"number":240,"ctx":["While desugaring module NegativeTests.ShortCircuiting"]}
-{"msg":["NegativeTests.ShortCircuiting.bad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":19,"col":4},"end_pos":{"line":19,"col":7}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":19,"col":4},"end_pos":{"line":19,"col":7}}},"number":240,"ctx":["While desugaring module NegativeTests.ShortCircuiting"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type b: Prims.bool{bad_p b}\ngot type Prims.bool","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":19,"col":31},"end_pos":{"line":19,"col":38}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":21,"col":16},"end_pos":{"line":21,"col":33}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec bad`","While typechecking the top-level declaration `[@@expect_failure] let rec bad`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":90},"end_pos":{"line":459,"col":102}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":25,"col":11},"end_pos":{"line":25,"col":36}}},"number":19,"ctx":["While typechecking the top-level declaration `let ff`","While typechecking the top-level declaration `[@@expect_failure] let ff`"]}
-{"msg":["Missing definitions in module NegativeTests.ShortCircuiting:\n  bad\n  ff"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":25,"col":0},"end_pos":{"line":25,"col":36}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":25,"col":0},"end_pos":{"line":25,"col":36}}},"number":240,"ctx":[]}
+{"msg":["NegativeTests.ShortCircuiting.ff\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":7}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":7}}},"number":240,"ctx":["While desugaring module NegativeTests.ShortCircuiting"]}
+{"msg":["NegativeTests.ShortCircuiting.bad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":19,"col":5},"end_pos":{"line":19,"col":8}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":19,"col":5},"end_pos":{"line":19,"col":8}}},"number":240,"ctx":["While desugaring module NegativeTests.ShortCircuiting"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type b: Prims.bool{bad_p b}\ngot type Prims.bool","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":19,"col":32},"end_pos":{"line":19,"col":39}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":21,"col":17},"end_pos":{"line":21,"col":34}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec bad`","While typechecking the top-level declaration `[@@expect_failure] let rec bad`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":91},"end_pos":{"line":459,"col":103}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":25,"col":12},"end_pos":{"line":25,"col":37}}},"number":19,"ctx":["While typechecking the top-level declaration `let ff`","While typechecking the top-level declaration `[@@expect_failure] let ff`"]}
+{"msg":["Missing definitions in module NegativeTests.ShortCircuiting:\n  bad\n  ff"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":25,"col":1},"end_pos":{"line":25,"col":37}},"use":{"file_name":"NegativeTests.ShortCircuiting.fst","start_pos":{"line":25,"col":1},"end_pos":{"line":25,"col":37}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/NegativeTests.ShortCircuiting.fst.output.expected b/tests/error-messages/NegativeTests.ShortCircuiting.fst.output.expected
index eff812a938c..279aa7c4b29 100644
--- a/tests/error-messages/NegativeTests.ShortCircuiting.fst.output.expected
+++ b/tests/error-messages/NegativeTests.ShortCircuiting.fst.output.expected
@@ -1,27 +1,27 @@
-* Warning 240 at NegativeTests.ShortCircuiting.fst(23,4-23,6):
+* Warning 240 at NegativeTests.ShortCircuiting.fst:23.5-23.7:
   - NegativeTests.ShortCircuiting.ff is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.ShortCircuiting.fst(19,4-19,7):
+* Warning 240 at NegativeTests.ShortCircuiting.fst:19.5-19.8:
   - NegativeTests.ShortCircuiting.bad is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at NegativeTests.ShortCircuiting.fst(21,16-21,33):
+* Info at NegativeTests.ShortCircuiting.fst:21.17-21.34:
   - Expected failure:
   - Subtyping check failed
   - Expected type b: Prims.bool{bad_p b} got type Prims.bool
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.ShortCircuiting.fst(19,31-19,38)
+  - See also NegativeTests.ShortCircuiting.fst:19.32-19.39
 
-* Info at NegativeTests.ShortCircuiting.fst(25,11-25,36):
+* Info at NegativeTests.ShortCircuiting.fst:25.12-25.37:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(459,90-459,102)
+  - See also Prims.fst:459.91-459.103
 
-* Warning 240 at NegativeTests.ShortCircuiting.fst(25,0-25,36):
+* Warning 240 at NegativeTests.ShortCircuiting.fst:25.1-25.37:
   - Missing definitions in module NegativeTests.ShortCircuiting:
       bad
       ff
diff --git a/tests/error-messages/NegativeTests.Termination.fst.json_output.expected b/tests/error-messages/NegativeTests.Termination.fst.json_output.expected
index 766647221f6..dfcc1cd95e9 100644
--- a/tests/error-messages/NegativeTests.Termination.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.Termination.fst.json_output.expected
@@ -1,21 +1,21 @@
-{"msg":["NegativeTests.Termination.xxx\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":91,"col":4},"end_pos":{"line":91,"col":7}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":91,"col":4},"end_pos":{"line":91,"col":7}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.minus\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":84,"col":4},"end_pos":{"line":84,"col":9}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":84,"col":4},"end_pos":{"line":84,"col":9}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.plus'\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":77,"col":4},"end_pos":{"line":77,"col":9}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":77,"col":4},"end_pos":{"line":77,"col":9}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.plus\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":69,"col":4},"end_pos":{"line":69,"col":8}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":69,"col":4},"end_pos":{"line":69,"col":8}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.t1\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":61,"col":4},"end_pos":{"line":61,"col":6}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":61,"col":4},"end_pos":{"line":61,"col":6}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.strangeZeroBad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":50,"col":4},"end_pos":{"line":50,"col":18}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":50,"col":4},"end_pos":{"line":50,"col":18}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.length_bad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":38,"col":4},"end_pos":{"line":38,"col":14}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":38,"col":4},"end_pos":{"line":38,"col":14}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.ackermann_bad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":31,"col":4},"end_pos":{"line":31,"col":17}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":31,"col":4},"end_pos":{"line":31,"col":17}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.repeat_diverge\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":18}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":23,"col":4},"end_pos":{"line":23,"col":18}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["NegativeTests.Termination.bug15\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":18,"col":4},"end_pos":{"line":18,"col":9}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":18,"col":4},"end_pos":{"line":18,"col":9}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":18,"col":12},"end_pos":{"line":21,"col":29}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":21,"col":28},"end_pos":{"line":21,"col":29}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec bug15`","While typechecking the top-level declaration `[@@expect_failure] let rec bug15`"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":25,"col":23},"end_pos":{"line":28,"col":35}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":28,"col":26},"end_pos":{"line":28,"col":35}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec repeat_diverge`","While typechecking the top-level declaration `[@@expect_failure] let rec repeat_diverge`"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":31,"col":19},"end_pos":{"line":36,"col":54}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":35,"col":43},"end_pos":{"line":35,"col":44}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec ackermann_bad`","While typechecking the top-level declaration `[@@expect_failure] let rec ackermann_bad`"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":40,"col":23},"end_pos":{"line":42,"col":29}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":42,"col":28},"end_pos":{"line":42,"col":29}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec length_bad`","While typechecking the top-level declaration `[@@expect_failure] let rec length_bad`"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":53,"col":2},"end_pos":{"line":55,"col":29}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":55,"col":15},"end_pos":{"line":55,"col":29}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec strangeZeroBad`","While typechecking the top-level declaration `[@@expect_failure] let rec strangeZeroBad`"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":64,"col":2},"end_pos":{"line":67,"col":29}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":67,"col":19},"end_pos":{"line":67,"col":29}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec t1`","While typechecking the top-level declaration `[@@expect_failure] let rec t1`"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":71,"col":13},"end_pos":{"line":75,"col":35}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":75,"col":34},"end_pos":{"line":75,"col":35}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec plus`","While typechecking the top-level declaration `[@@expect_failure] let rec plus`"]}
-{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":80,"col":2},"end_pos":{"line":82,"col":14}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":80,"col":2},"end_pos":{"line":82,"col":14}}},"number":19,"ctx":["While typechecking the top-level declaration `let plus'`","While typechecking the top-level declaration `[@@expect_failure] let plus'`"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":86,"col":15},"end_pos":{"line":89,"col":31}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":89,"col":29},"end_pos":{"line":89,"col":31}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec minus`","While typechecking the top-level declaration `[@@expect_failure] let rec minus`"]}
-{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":94,"col":2},"end_pos":{"line":96,"col":26}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":96,"col":20},"end_pos":{"line":96,"col":26}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec xxx`","While typechecking the top-level declaration `[@@expect_failure] let rec xxx`"]}
-{"msg":["Missing definitions in module NegativeTests.Termination:\n  ackermann_bad\n  bug15\n  length_bad\n  minus\n  plus\n  plus'\n  repeat_diverge\n  strangeZeroBad\n  t1\n  xxx"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":93,"col":0},"end_pos":{"line":96,"col":26}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":93,"col":0},"end_pos":{"line":96,"col":26}}},"number":240,"ctx":[]}
+{"msg":["NegativeTests.Termination.xxx\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":91,"col":5},"end_pos":{"line":91,"col":8}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":91,"col":5},"end_pos":{"line":91,"col":8}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.minus\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":84,"col":5},"end_pos":{"line":84,"col":10}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":84,"col":5},"end_pos":{"line":84,"col":10}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.plus'\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":77,"col":5},"end_pos":{"line":77,"col":10}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":77,"col":5},"end_pos":{"line":77,"col":10}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.plus\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":69,"col":5},"end_pos":{"line":69,"col":9}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":69,"col":5},"end_pos":{"line":69,"col":9}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.t1\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":61,"col":5},"end_pos":{"line":61,"col":7}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":61,"col":5},"end_pos":{"line":61,"col":7}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.strangeZeroBad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":50,"col":5},"end_pos":{"line":50,"col":19}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":50,"col":5},"end_pos":{"line":50,"col":19}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.length_bad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":38,"col":5},"end_pos":{"line":38,"col":15}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":38,"col":5},"end_pos":{"line":38,"col":15}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.ackermann_bad\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":31,"col":5},"end_pos":{"line":31,"col":18}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":31,"col":5},"end_pos":{"line":31,"col":18}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.repeat_diverge\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":19}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":23,"col":5},"end_pos":{"line":23,"col":19}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["NegativeTests.Termination.bug15\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":18,"col":5},"end_pos":{"line":18,"col":10}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":18,"col":5},"end_pos":{"line":18,"col":10}}},"number":240,"ctx":["While desugaring module NegativeTests.Termination"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":18,"col":13},"end_pos":{"line":21,"col":30}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":21,"col":29},"end_pos":{"line":21,"col":30}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec bug15`","While typechecking the top-level declaration `[@@expect_failure] let rec bug15`"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":25,"col":24},"end_pos":{"line":28,"col":36}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":28,"col":27},"end_pos":{"line":28,"col":36}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec repeat_diverge`","While typechecking the top-level declaration `[@@expect_failure] let rec repeat_diverge`"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":31,"col":20},"end_pos":{"line":36,"col":55}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":35,"col":44},"end_pos":{"line":35,"col":45}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec ackermann_bad`","While typechecking the top-level declaration `[@@expect_failure] let rec ackermann_bad`"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":40,"col":24},"end_pos":{"line":42,"col":30}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":42,"col":29},"end_pos":{"line":42,"col":30}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec length_bad`","While typechecking the top-level declaration `[@@expect_failure] let rec length_bad`"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":53,"col":3},"end_pos":{"line":55,"col":30}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":55,"col":16},"end_pos":{"line":55,"col":30}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec strangeZeroBad`","While typechecking the top-level declaration `[@@expect_failure] let rec strangeZeroBad`"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":64,"col":3},"end_pos":{"line":67,"col":30}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":67,"col":20},"end_pos":{"line":67,"col":30}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec t1`","While typechecking the top-level declaration `[@@expect_failure] let rec t1`"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":71,"col":14},"end_pos":{"line":75,"col":36}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":75,"col":35},"end_pos":{"line":75,"col":36}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec plus`","While typechecking the top-level declaration `[@@expect_failure] let rec plus`"]}
+{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":80,"col":3},"end_pos":{"line":82,"col":15}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":80,"col":3},"end_pos":{"line":82,"col":15}}},"number":19,"ctx":["While typechecking the top-level declaration `let plus'`","While typechecking the top-level declaration `[@@expect_failure] let plus'`"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":86,"col":16},"end_pos":{"line":89,"col":32}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":89,"col":30},"end_pos":{"line":89,"col":32}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec minus`","While typechecking the top-level declaration `[@@expect_failure] let rec minus`"]}
+{"msg":["Expected failure:","Could not prove termination of this recursive call","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":94,"col":3},"end_pos":{"line":96,"col":27}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":96,"col":21},"end_pos":{"line":96,"col":27}}},"number":19,"ctx":["While typechecking the top-level declaration `let rec xxx`","While typechecking the top-level declaration `[@@expect_failure] let rec xxx`"]}
+{"msg":["Missing definitions in module NegativeTests.Termination:\n  ackermann_bad\n  bug15\n  length_bad\n  minus\n  plus\n  plus'\n  repeat_diverge\n  strangeZeroBad\n  t1\n  xxx"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":93,"col":1},"end_pos":{"line":96,"col":27}},"use":{"file_name":"NegativeTests.Termination.fst","start_pos":{"line":93,"col":1},"end_pos":{"line":96,"col":27}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/NegativeTests.Termination.fst.output.expected b/tests/error-messages/NegativeTests.Termination.fst.output.expected
index a20c0c16003..fe52ce94dbb 100644
--- a/tests/error-messages/NegativeTests.Termination.fst.output.expected
+++ b/tests/error-messages/NegativeTests.Termination.fst.output.expected
@@ -1,116 +1,116 @@
-* Warning 240 at NegativeTests.Termination.fst(91,4-91,7):
+* Warning 240 at NegativeTests.Termination.fst:91.5-91.8:
   - NegativeTests.Termination.xxx is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(84,4-84,9):
+* Warning 240 at NegativeTests.Termination.fst:84.5-84.10:
   - NegativeTests.Termination.minus is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(77,4-77,9):
+* Warning 240 at NegativeTests.Termination.fst:77.5-77.10:
   - NegativeTests.Termination.plus' is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(69,4-69,8):
+* Warning 240 at NegativeTests.Termination.fst:69.5-69.9:
   - NegativeTests.Termination.plus is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(61,4-61,6):
+* Warning 240 at NegativeTests.Termination.fst:61.5-61.7:
   - NegativeTests.Termination.t1 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(50,4-50,18):
+* Warning 240 at NegativeTests.Termination.fst:50.5-50.19:
   - NegativeTests.Termination.strangeZeroBad
     is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(38,4-38,14):
+* Warning 240 at NegativeTests.Termination.fst:38.5-38.15:
   - NegativeTests.Termination.length_bad is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(31,4-31,17):
+* Warning 240 at NegativeTests.Termination.fst:31.5-31.18:
   - NegativeTests.Termination.ackermann_bad
     is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(23,4-23,18):
+* Warning 240 at NegativeTests.Termination.fst:23.5-23.19:
   - NegativeTests.Termination.repeat_diverge
     is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at NegativeTests.Termination.fst(18,4-18,9):
+* Warning 240 at NegativeTests.Termination.fst:18.5-18.10:
   - NegativeTests.Termination.bug15 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at NegativeTests.Termination.fst(21,28-21,29):
+* Info at NegativeTests.Termination.fst:21.29-21.30:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(18,12-21,29)
+  - See also NegativeTests.Termination.fst:18.13-21.30
 
-* Info at NegativeTests.Termination.fst(28,26-28,35):
+* Info at NegativeTests.Termination.fst:28.27-28.36:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(25,23-28,35)
+  - See also NegativeTests.Termination.fst:25.24-28.36
 
-* Info at NegativeTests.Termination.fst(35,43-35,44):
+* Info at NegativeTests.Termination.fst:35.44-35.45:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(31,19-36,54)
+  - See also NegativeTests.Termination.fst:31.20-36.55
 
-* Info at NegativeTests.Termination.fst(42,28-42,29):
+* Info at NegativeTests.Termination.fst:42.29-42.30:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(40,23-42,29)
+  - See also NegativeTests.Termination.fst:40.24-42.30
 
-* Info at NegativeTests.Termination.fst(55,15-55,29):
+* Info at NegativeTests.Termination.fst:55.16-55.30:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(53,2-55,29)
+  - See also NegativeTests.Termination.fst:53.3-55.30
 
-* Info at NegativeTests.Termination.fst(67,19-67,29):
+* Info at NegativeTests.Termination.fst:67.20-67.30:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(64,2-67,29)
+  - See also NegativeTests.Termination.fst:64.3-67.30
 
-* Info at NegativeTests.Termination.fst(75,34-75,35):
+* Info at NegativeTests.Termination.fst:75.35-75.36:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(71,13-75,35)
+  - See also NegativeTests.Termination.fst:71.14-75.36
 
-* Info at NegativeTests.Termination.fst(80,2-82,14):
+* Info at NegativeTests.Termination.fst:80.3-82.15:
   - Expected failure:
   - Patterns are incomplete
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Info at NegativeTests.Termination.fst(89,29-89,31):
+* Info at NegativeTests.Termination.fst:89.30-89.32:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(86,15-89,31)
+  - See also NegativeTests.Termination.fst:86.16-89.32
 
-* Info at NegativeTests.Termination.fst(96,20-96,26):
+* Info at NegativeTests.Termination.fst:96.21-96.27:
   - Expected failure:
   - Could not prove termination of this recursive call
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also NegativeTests.Termination.fst(94,2-96,26)
+  - See also NegativeTests.Termination.fst:94.3-96.27
 
-* Warning 240 at NegativeTests.Termination.fst(93,0-96,26):
+* Warning 240 at NegativeTests.Termination.fst:93.1-96.27:
   - Missing definitions in module NegativeTests.Termination:
       ackermann_bad
       bug15
diff --git a/tests/error-messages/NegativeTests.ZZImplicitFalse.fst.json_output.expected b/tests/error-messages/NegativeTests.ZZImplicitFalse.fst.json_output.expected
index b97ec4ac4e1..4d45695a4f8 100644
--- a/tests/error-messages/NegativeTests.ZZImplicitFalse.fst.json_output.expected
+++ b/tests/error-messages/NegativeTests.ZZImplicitFalse.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["NegativeTests.ZZImplicitFalse.test\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":18,"col":4},"end_pos":{"line":18,"col":8}},"use":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":18,"col":4},"end_pos":{"line":18,"col":8}}},"number":240,"ctx":["While desugaring module NegativeTests.ZZImplicitFalse"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.l_False\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":167,"col":29},"end_pos":{"line":167,"col":34}},"use":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":20,"col":27},"end_pos":{"line":20,"col":28}}},"number":19,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
-{"msg":["Missing definitions in module NegativeTests.ZZImplicitFalse: test"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":20,"col":0},"end_pos":{"line":20,"col":34}},"use":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":20,"col":0},"end_pos":{"line":20,"col":34}}},"number":240,"ctx":[]}
+{"msg":["NegativeTests.ZZImplicitFalse.test\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":18,"col":5},"end_pos":{"line":18,"col":9}},"use":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":18,"col":5},"end_pos":{"line":18,"col":9}}},"number":240,"ctx":["While desugaring module NegativeTests.ZZImplicitFalse"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.l_False\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":167,"col":30},"end_pos":{"line":167,"col":35}},"use":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":20,"col":28},"end_pos":{"line":20,"col":29}}},"number":19,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
+{"msg":["Missing definitions in module NegativeTests.ZZImplicitFalse: test"],"level":"Warning","range":{"def":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":20,"col":1},"end_pos":{"line":20,"col":35}},"use":{"file_name":"NegativeTests.ZZImplicitFalse.fst","start_pos":{"line":20,"col":1},"end_pos":{"line":20,"col":35}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/NegativeTests.ZZImplicitFalse.fst.output.expected b/tests/error-messages/NegativeTests.ZZImplicitFalse.fst.output.expected
index 8a7673e830c..22c4f443d5d 100644
--- a/tests/error-messages/NegativeTests.ZZImplicitFalse.fst.output.expected
+++ b/tests/error-messages/NegativeTests.ZZImplicitFalse.fst.output.expected
@@ -1,15 +1,15 @@
-* Warning 240 at NegativeTests.ZZImplicitFalse.fst(18,4-18,8):
+* Warning 240 at NegativeTests.ZZImplicitFalse.fst:18.5-18.9:
   - NegativeTests.ZZImplicitFalse.test is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at NegativeTests.ZZImplicitFalse.fst(20,27-20,28):
+* Info at NegativeTests.ZZImplicitFalse.fst:20.28-20.29:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.l_False got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(167,29-167,34)
+  - See also Prims.fst:167.30-167.35
 
-* Warning 240 at NegativeTests.ZZImplicitFalse.fst(20,0-20,34):
+* Warning 240 at NegativeTests.ZZImplicitFalse.fst:20.1-20.35:
   - Missing definitions in module NegativeTests.ZZImplicitFalse: test
 
diff --git a/tests/error-messages/NonLinear.fst.output.expected b/tests/error-messages/NonLinear.fst.output.expected
index b1c1d707632..6e3648f6fc8 100644
--- a/tests/error-messages/NonLinear.fst.output.expected
+++ b/tests/error-messages/NonLinear.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at NonLinear.fst(6,9-6,10):
+* Info at NonLinear.fst:6.10-6.11:
   - Expected failure:
   - Non-linear patterns are not permitted: `x` appears more than once in this pattern.
 
diff --git a/tests/error-messages/OccursCheckOnArrows.fst.json_output.expected b/tests/error-messages/OccursCheckOnArrows.fst.json_output.expected
index ccb7f470872..ce9b4e8308c 100644
--- a/tests/error-messages/OccursCheckOnArrows.fst.json_output.expected
+++ b/tests/error-messages/OccursCheckOnArrows.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","_: (*?u5*)_ -> (*?u4*)_ is not a subtype of the expected type (*?u5*)_"],"level":"Info","range":{"def":{"file_name":"OccursCheckOnArrows.fst","start_pos":{"line":18,"col":9},"end_pos":{"line":18,"col":10}},"use":{"file_name":"OccursCheckOnArrows.fst","start_pos":{"line":18,"col":15},"end_pos":{"line":18,"col":16}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let oops`","While typechecking the top-level declaration `[@@expect_failure] let oops`"]}
+{"msg":["Expected failure:","_: (*?u5*)_ -> (*?u4*)_ is not a subtype of the expected type (*?u5*)_"],"level":"Info","range":{"def":{"file_name":"OccursCheckOnArrows.fst","start_pos":{"line":18,"col":10},"end_pos":{"line":18,"col":11}},"use":{"file_name":"OccursCheckOnArrows.fst","start_pos":{"line":18,"col":16},"end_pos":{"line":18,"col":17}}},"number":54,"ctx":["While solving deferred constraints","solve_non_tactic_deferred_constraints","While typechecking the top-level declaration `let oops`","While typechecking the top-level declaration `[@@expect_failure] let oops`"]}
diff --git a/tests/error-messages/OccursCheckOnArrows.fst.output.expected b/tests/error-messages/OccursCheckOnArrows.fst.output.expected
index b597df6972b..2f5d89dcea8 100644
--- a/tests/error-messages/OccursCheckOnArrows.fst.output.expected
+++ b/tests/error-messages/OccursCheckOnArrows.fst.output.expected
@@ -1,5 +1,5 @@
-* Info at OccursCheckOnArrows.fst(18,15-18,16):
+* Info at OccursCheckOnArrows.fst:18.16-18.17:
   - Expected failure:
   - _: (*?u5*)_ -> (*?u4*)_ is not a subtype of the expected type (*?u5*)_
-  - See also OccursCheckOnArrows.fst(18,9-18,10)
+  - See also OccursCheckOnArrows.fst:18.10-18.11
 
diff --git a/tests/error-messages/OptionStack.fst.json_output.expected b/tests/error-messages/OptionStack.fst.json_output.expected
index 51266b91bce..fded037d0ac 100644
--- a/tests/error-messages/OptionStack.fst.json_output.expected
+++ b/tests/error-messages/OptionStack.fst.json_output.expected
@@ -1,4 +1,4 @@
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"OptionStack.fst","start_pos":{"line":21,"col":16},"end_pos":{"line":21,"col":21}},"use":{"file_name":"OptionStack.fst","start_pos":{"line":21,"col":9},"end_pos":{"line":21,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let t0`","While typechecking the top-level declaration `[@@expect_failure] let t0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"OptionStack.fst","start_pos":{"line":24,"col":16},"end_pos":{"line":24,"col":21}},"use":{"file_name":"OptionStack.fst","start_pos":{"line":24,"col":9},"end_pos":{"line":24,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let t1`","While typechecking the top-level declaration `[@@expect_failure] let t1`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"OptionStack.fst","start_pos":{"line":27,"col":16},"end_pos":{"line":27,"col":21}},"use":{"file_name":"OptionStack.fst","start_pos":{"line":27,"col":9},"end_pos":{"line":27,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let t2`","While typechecking the top-level declaration `[@@expect_failure] let t2`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"OptionStack.fst","start_pos":{"line":39,"col":16},"end_pos":{"line":39,"col":21}},"use":{"file_name":"OptionStack.fst","start_pos":{"line":39,"col":9},"end_pos":{"line":39,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let t7`","While typechecking the top-level declaration `[@@expect_failure] let t7`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"OptionStack.fst","start_pos":{"line":21,"col":17},"end_pos":{"line":21,"col":22}},"use":{"file_name":"OptionStack.fst","start_pos":{"line":21,"col":10},"end_pos":{"line":21,"col":16}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let t0`","While typechecking the top-level declaration `[@@expect_failure] let t0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"OptionStack.fst","start_pos":{"line":24,"col":17},"end_pos":{"line":24,"col":22}},"use":{"file_name":"OptionStack.fst","start_pos":{"line":24,"col":10},"end_pos":{"line":24,"col":16}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let t1`","While typechecking the top-level declaration `[@@expect_failure] let t1`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"OptionStack.fst","start_pos":{"line":27,"col":17},"end_pos":{"line":27,"col":22}},"use":{"file_name":"OptionStack.fst","start_pos":{"line":27,"col":10},"end_pos":{"line":27,"col":16}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let t2`","While typechecking the top-level declaration `[@@expect_failure] let t2`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"OptionStack.fst","start_pos":{"line":39,"col":17},"end_pos":{"line":39,"col":22}},"use":{"file_name":"OptionStack.fst","start_pos":{"line":39,"col":10},"end_pos":{"line":39,"col":16}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let t7`","While typechecking the top-level declaration `[@@expect_failure] let t7`"]}
diff --git a/tests/error-messages/OptionStack.fst.output.expected b/tests/error-messages/OptionStack.fst.output.expected
index a37372f85e7..8d8f45d7b51 100644
--- a/tests/error-messages/OptionStack.fst.output.expected
+++ b/tests/error-messages/OptionStack.fst.output.expected
@@ -1,28 +1,28 @@
-* Info at OptionStack.fst(21,9-21,15):
+* Info at OptionStack.fst:21.10-21.16:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also OptionStack.fst(21,16-21,21)
+  - See also OptionStack.fst:21.17-21.22
 
-* Info at OptionStack.fst(24,9-24,15):
+* Info at OptionStack.fst:24.10-24.16:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also OptionStack.fst(24,16-24,21)
+  - See also OptionStack.fst:24.17-24.22
 
-* Info at OptionStack.fst(27,9-27,15):
+* Info at OptionStack.fst:27.10-27.16:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also OptionStack.fst(27,16-27,21)
+  - See also OptionStack.fst:27.17-27.22
 
-* Info at OptionStack.fst(39,9-39,15):
+* Info at OptionStack.fst:39.10-39.16:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also OptionStack.fst(39,16-39,21)
+  - See also OptionStack.fst:39.17-39.22
 
diff --git a/tests/error-messages/PatAnnot.fst.json_output.expected b/tests/error-messages/PatAnnot.fst.json_output.expected
index d5f81f9ac33..a5c05cf92a2 100644
--- a/tests/error-messages/PatAnnot.fst.json_output.expected
+++ b/tests/error-messages/PatAnnot.fst.json_output.expected
@@ -1,6 +1,6 @@
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash Prims.l_False\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"PatAnnot.fst","start_pos":{"line":25,"col":19},"end_pos":{"line":25,"col":24}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":25,"col":8},"end_pos":{"line":25,"col":9}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let whoops`","While typechecking the top-level declaration `[@@expect_failure] let whoops`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: Prims.fst(467,77-467,89)",""],"level":"Info","range":{"def":{"file_name":"PatAnnot.fst","start_pos":{"line":28,"col":0},"end_pos":{"line":30,"col":14}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":28,"col":0},"end_pos":{"line":30,"col":14}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let whoops2`","While typechecking the top-level declaration `[@@expect_failure] let whoops2`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: Prims.fst(467,77-467,89)",""],"level":"Info","range":{"def":{"file_name":"PatAnnot.fst","start_pos":{"line":33,"col":0},"end_pos":{"line":35,"col":14}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":33,"col":0},"end_pos":{"line":35,"col":14}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let sub_bv`","While typechecking the top-level declaration `[@@expect_failure] let sub_bv`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash Prims.l_False\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"PatAnnot.fst","start_pos":{"line":40,"col":26},"end_pos":{"line":40,"col":31}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":39,"col":10},"end_pos":{"line":39,"col":12}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let s`","While typechecking the top-level declaration `[@@expect_failure] let s`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":46,"col":10},"end_pos":{"line":46,"col":11}}},"number":19,"ctx":["While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
-{"msg":["Expected failure:","Type annotation on parameter incompatible with the expected type","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":55,"col":36},"end_pos":{"line":55,"col":39}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash Prims.l_False\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"PatAnnot.fst","start_pos":{"line":25,"col":20},"end_pos":{"line":25,"col":25}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":25,"col":9},"end_pos":{"line":25,"col":10}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let whoops`","While typechecking the top-level declaration `[@@expect_failure] let whoops`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: Prims.fst:467.78-467.90",""],"level":"Info","range":{"def":{"file_name":"PatAnnot.fst","start_pos":{"line":28,"col":1},"end_pos":{"line":30,"col":15}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":28,"col":1},"end_pos":{"line":30,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let whoops2`","While typechecking the top-level declaration `[@@expect_failure] let whoops2`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: Prims.fst:467.78-467.90",""],"level":"Info","range":{"def":{"file_name":"PatAnnot.fst","start_pos":{"line":33,"col":1},"end_pos":{"line":35,"col":15}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":33,"col":1},"end_pos":{"line":35,"col":15}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let sub_bv`","While typechecking the top-level declaration `[@@expect_failure] let sub_bv`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash Prims.l_False\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"PatAnnot.fst","start_pos":{"line":40,"col":27},"end_pos":{"line":40,"col":32}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":39,"col":11},"end_pos":{"line":39,"col":13}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let s`","While typechecking the top-level declaration `[@@expect_failure] let s`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":46,"col":11},"end_pos":{"line":46,"col":12}}},"number":19,"ctx":["While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
+{"msg":["Expected failure:","Type annotation on parameter incompatible with the expected type","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"PatAnnot.fst","start_pos":{"line":55,"col":37},"end_pos":{"line":55,"col":40}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
diff --git a/tests/error-messages/PatAnnot.fst.output.expected b/tests/error-messages/PatAnnot.fst.output.expected
index cde13c2998b..67fd78612d7 100644
--- a/tests/error-messages/PatAnnot.fst.output.expected
+++ b/tests/error-messages/PatAnnot.fst.output.expected
@@ -1,45 +1,45 @@
-* Info at PatAnnot.fst(25,8-25,9):
+* Info at PatAnnot.fst:25.9-25.10:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash Prims.l_False got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also PatAnnot.fst(25,19-25,24)
+  - See also PatAnnot.fst:25.20-25.25
 
-* Info at PatAnnot.fst(28,0-30,14):
+* Info at PatAnnot.fst:28.1-30.15:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: Prims.fst(467,77-467,89)
+  - Also see: Prims.fst:467.78-467.90
 
-* Info at PatAnnot.fst(33,0-35,14):
+* Info at PatAnnot.fst:33.1-35.15:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: Prims.fst(467,77-467,89)
+  - Also see: Prims.fst:467.78-467.90
 
-* Info at PatAnnot.fst(39,10-39,12):
+* Info at PatAnnot.fst:39.11-39.13:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash Prims.l_False got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also PatAnnot.fst(40,26-40,31)
+  - See also PatAnnot.fst:40.27-40.32
 
-* Info at PatAnnot.fst(46,10-46,11):
+* Info at PatAnnot.fst:46.11-46.12:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at PatAnnot.fst(55,36-55,39):
+* Info at PatAnnot.fst:55.37-55.40:
   - Expected failure:
   - Type annotation on parameter incompatible with the expected type
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
diff --git a/tests/error-messages/PatCoerce.fst.json_output.expected b/tests/error-messages/PatCoerce.fst.json_output.expected
index 1de7b46c693..464a85e7ae8 100644
--- a/tests/error-messages/PatCoerce.fst.json_output.expected
+++ b/tests/error-messages/PatCoerce.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["PatCoerce.bla\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"PatCoerce.fst","start_pos":{"line":20,"col":4},"end_pos":{"line":20,"col":7}},"use":{"file_name":"PatCoerce.fst","start_pos":{"line":20,"col":4},"end_pos":{"line":20,"col":7}}},"number":240,"ctx":["While desugaring module PatCoerce"]}
-{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Type0)"],"level":"Info","range":{"def":{"file_name":"PatCoerce.fst","start_pos":{"line":25,"col":4},"end_pos":{"line":25,"col":8}},"use":{"file_name":"PatCoerce.fst","start_pos":{"line":25,"col":4},"end_pos":{"line":25,"col":8}}},"number":114,"ctx":["While typechecking the top-level declaration `let bla`","While typechecking the top-level declaration `[@@expect_failure] let bla`"]}
-{"msg":["Missing definitions in module PatCoerce: bla"],"level":"Warning","range":{"def":{"file_name":"PatCoerce.fst","start_pos":{"line":23,"col":0},"end_pos":{"line":26,"col":14}},"use":{"file_name":"PatCoerce.fst","start_pos":{"line":23,"col":0},"end_pos":{"line":26,"col":14}}},"number":240,"ctx":[]}
+{"msg":["PatCoerce.bla\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"PatCoerce.fst","start_pos":{"line":20,"col":5},"end_pos":{"line":20,"col":8}},"use":{"file_name":"PatCoerce.fst","start_pos":{"line":20,"col":5},"end_pos":{"line":20,"col":8}}},"number":240,"ctx":["While desugaring module PatCoerce"]}
+{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Type0)"],"level":"Info","range":{"def":{"file_name":"PatCoerce.fst","start_pos":{"line":25,"col":5},"end_pos":{"line":25,"col":9}},"use":{"file_name":"PatCoerce.fst","start_pos":{"line":25,"col":5},"end_pos":{"line":25,"col":9}}},"number":114,"ctx":["While typechecking the top-level declaration `let bla`","While typechecking the top-level declaration `[@@expect_failure] let bla`"]}
+{"msg":["Missing definitions in module PatCoerce: bla"],"level":"Warning","range":{"def":{"file_name":"PatCoerce.fst","start_pos":{"line":23,"col":1},"end_pos":{"line":26,"col":15}},"use":{"file_name":"PatCoerce.fst","start_pos":{"line":23,"col":1},"end_pos":{"line":26,"col":15}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/PatCoerce.fst.output.expected b/tests/error-messages/PatCoerce.fst.output.expected
index c05bab62684..b8ef7d058ea 100644
--- a/tests/error-messages/PatCoerce.fst.output.expected
+++ b/tests/error-messages/PatCoerce.fst.output.expected
@@ -1,11 +1,11 @@
-* Warning 240 at PatCoerce.fst(20,4-20,7):
+* Warning 240 at PatCoerce.fst:20.5-20.8:
   - PatCoerce.bla is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at PatCoerce.fst(25,4-25,8):
+* Info at PatCoerce.fst:25.5-25.9:
   - Expected failure:
   - Type of pattern (Prims.bool) does not match type of scrutinee (Type0)
 
-* Warning 240 at PatCoerce.fst(23,0-26,14):
+* Warning 240 at PatCoerce.fst:23.1-26.15:
   - Missing definitions in module PatCoerce: bla
 
diff --git a/tests/error-messages/PatternMatch.fst.json_output.expected b/tests/error-messages/PatternMatch.fst.json_output.expected
index 257c49b3e74..9773ebe6f4c 100644
--- a/tests/error-messages/PatternMatch.fst.json_output.expected
+++ b/tests/error-messages/PatternMatch.fst.json_output.expected
@@ -1,14 +1,14 @@
-{"msg":["Expected failure:","Type ascriptions within patterns are only allowed on variables"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":15,"col":27},"end_pos":{"line":15,"col":34}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":15,"col":27},"end_pos":{"line":15,"col":34}}},"number":178,"ctx":["While desugaring module PatternMatch"]}
-{"msg":["Expected failure:","Type ascriptions within patterns are only allowed on variables"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":18,"col":29},"end_pos":{"line":18,"col":48}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":18,"col":29},"end_pos":{"line":18,"col":48}}},"number":178,"ctx":["While desugaring module PatternMatch"]}
-{"msg":["Expected failure:","Type ascriptions within patterns are only allowed on variables"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":41,"col":3},"end_pos":{"line":41,"col":24}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":41,"col":3},"end_pos":{"line":41,"col":24}}},"number":178,"ctx":["While desugaring module PatternMatch"]}
-{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst(21,4-21,8)",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
-{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst(24,4-24,11)",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
-{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst(29,4-29,8)",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
-{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":32,"col":4},"end_pos":{"line":32,"col":9}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":32,"col":4},"end_pos":{"line":32,"col":9}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
-{"msg":["Expected failure:","Type of pattern PatternMatch.ab\ndoes not match type of scrutinee Prims.int","Head mismatch PatternMatch.ab vs Prims.int"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":35,"col":4},"end_pos":{"line":35,"col":5}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":35,"col":4},"end_pos":{"line":35,"col":5}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
-{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst(38,4-38,5)",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
-{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":55,"col":4},"end_pos":{"line":55,"col":8}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":55,"col":4},"end_pos":{"line":55,"col":8}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
-{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":58,"col":4},"end_pos":{"line":58,"col":16}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":58,"col":4},"end_pos":{"line":58,"col":16}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
-{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst(61,5-61,12)",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let x`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
-{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst(64,5-64,20)",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let x`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
-{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":69,"col":5},"end_pos":{"line":69,"col":15}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":69,"col":5},"end_pos":{"line":69,"col":15}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___11`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
+{"msg":["Expected failure:","Type ascriptions within patterns are only allowed on variables"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":15,"col":28},"end_pos":{"line":15,"col":35}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":15,"col":28},"end_pos":{"line":15,"col":35}}},"number":178,"ctx":["While desugaring module PatternMatch"]}
+{"msg":["Expected failure:","Type ascriptions within patterns are only allowed on variables"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":18,"col":30},"end_pos":{"line":18,"col":49}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":18,"col":30},"end_pos":{"line":18,"col":49}}},"number":178,"ctx":["While desugaring module PatternMatch"]}
+{"msg":["Expected failure:","Type ascriptions within patterns are only allowed on variables"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":41,"col":4},"end_pos":{"line":41,"col":25}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":41,"col":4},"end_pos":{"line":41,"col":25}}},"number":178,"ctx":["While desugaring module PatternMatch"]}
+{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst:21.5-21.9",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
+{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst:24.5-24.12",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___2`","While typechecking the top-level declaration `[@@expect_failure] let uu___1`"]}
+{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst:29.5-29.9",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
+{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":32,"col":5},"end_pos":{"line":32,"col":10}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":32,"col":5},"end_pos":{"line":32,"col":10}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
+{"msg":["Expected failure:","Type of pattern PatternMatch.ab\ndoes not match type of scrutinee Prims.int","Head mismatch PatternMatch.ab vs Prims.int"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":35,"col":5},"end_pos":{"line":35,"col":6}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":35,"col":5},"end_pos":{"line":35,"col":6}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
+{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst:38.5-38.6",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___4`","While typechecking the top-level declaration `[@@expect_failure] let uu___3`"]}
+{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":55,"col":5},"end_pos":{"line":55,"col":9}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":55,"col":5},"end_pos":{"line":55,"col":9}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
+{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":58,"col":5},"end_pos":{"line":58,"col":17}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":58,"col":5},"end_pos":{"line":58,"col":17}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___10`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
+{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst:61.6-61.13",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let x`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
+{"msg":["Expected failure:","Patterns are incomplete","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: PatternMatch.fst:64.6-64.21",""],"level":"Info","range":{"def":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}},"use":{"file_name":"dummy","start_pos":{"line":0,"col":0},"end_pos":{"line":0,"col":0}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let x`","While typechecking the top-level declaration `[@@expect_failure] let uu___9`"]}
+{"msg":["Expected failure:","Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)"],"level":"Info","range":{"def":{"file_name":"PatternMatch.fst","start_pos":{"line":69,"col":6},"end_pos":{"line":69,"col":16}},"use":{"file_name":"PatternMatch.fst","start_pos":{"line":69,"col":6},"end_pos":{"line":69,"col":16}}},"number":114,"ctx":["While typechecking the top-level declaration `let uu___11`","While typechecking the top-level declaration `[@@expect_failure] let uu___10`"]}
diff --git a/tests/error-messages/PatternMatch.fst.output.expected b/tests/error-messages/PatternMatch.fst.output.expected
index c3209c1d037..c36279be2ee 100644
--- a/tests/error-messages/PatternMatch.fst.output.expected
+++ b/tests/error-messages/PatternMatch.fst.output.expected
@@ -1,12 +1,12 @@
-* Info at PatternMatch.fst(15,27-15,34):
+* Info at PatternMatch.fst:15.28-15.35:
   - Expected failure:
   - Type ascriptions within patterns are only allowed on variables
 
-* Info at PatternMatch.fst(18,29-18,48):
+* Info at PatternMatch.fst:18.30-18.49:
   - Expected failure:
   - Type ascriptions within patterns are only allowed on variables
 
-* Info at PatternMatch.fst(41,3-41,24):
+* Info at PatternMatch.fst:41.4-41.25:
   - Expected failure:
   - Type ascriptions within patterns are only allowed on variables
 
@@ -15,27 +15,27 @@
   - Patterns are incomplete
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: PatternMatch.fst(21,4-21,8)
+  - Also see: PatternMatch.fst:21.5-21.9
 
 * Info:
   - Expected failure:
   - Patterns are incomplete
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: PatternMatch.fst(24,4-24,11)
+  - Also see: PatternMatch.fst:24.5-24.12
 
 * Info:
   - Expected failure:
   - Patterns are incomplete
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: PatternMatch.fst(29,4-29,8)
+  - Also see: PatternMatch.fst:29.5-29.9
 
-* Info at PatternMatch.fst(32,4-32,9):
+* Info at PatternMatch.fst:32.5-32.10:
   - Expected failure:
   - Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)
 
-* Info at PatternMatch.fst(35,4-35,5):
+* Info at PatternMatch.fst:35.5-35.6:
   - Expected failure:
   - Type of pattern PatternMatch.ab does not match type of scrutinee Prims.int
   - Head mismatch PatternMatch.ab vs Prims.int
@@ -45,13 +45,13 @@
   - Patterns are incomplete
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: PatternMatch.fst(38,4-38,5)
+  - Also see: PatternMatch.fst:38.5-38.6
 
-* Info at PatternMatch.fst(55,4-55,8):
+* Info at PatternMatch.fst:55.5-55.9:
   - Expected failure:
   - Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)
 
-* Info at PatternMatch.fst(58,4-58,16):
+* Info at PatternMatch.fst:58.5-58.17:
   - Expected failure:
   - Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)
 
@@ -60,16 +60,16 @@
   - Patterns are incomplete
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: PatternMatch.fst(61,5-61,12)
+  - Also see: PatternMatch.fst:61.6-61.13
 
 * Info:
   - Expected failure:
   - Patterns are incomplete
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: PatternMatch.fst(64,5-64,20)
+  - Also see: PatternMatch.fst:64.6-64.21
 
-* Info at PatternMatch.fst(69,5-69,15):
+* Info at PatternMatch.fst:69.6-69.16:
   - Expected failure:
   - Type of pattern (Prims.bool) does not match type of scrutinee (Prims.int)
 
diff --git a/tests/error-messages/QuickTest.fst.json_output.expected b/tests/error-messages/QuickTest.fst.json_output.expected
index 548c566204e..c0861317c48 100644
--- a/tests/error-messages/QuickTest.fst.json_output.expected
+++ b/tests/error-messages/QuickTest.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: QuickTest(1,2-3,4)","Other related locations: QuickTest.fst(116,12-116,20)"],"level":"Info","range":{"def":{"file_name":"QuickTest.fst","start_pos":{"line":131,"col":2},"end_pos":{"line":134,"col":34}},"use":{"file_name":"QuickTest.fst","start_pos":{"line":131,"col":2},"end_pos":{"line":134,"col":34}}},"number":19,"ctx":["While typechecking the top-level declaration `let va_lemma_Test2`","While typechecking the top-level declaration `[@@expect_failure] let va_lemma_Test2`"]}
+{"msg":["Expected failure:","","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: QuickTest:1.2-3.4","Other related locations: QuickTest.fst:116.13-116.21"],"level":"Info","range":{"def":{"file_name":"QuickTest.fst","start_pos":{"line":131,"col":3},"end_pos":{"line":134,"col":35}},"use":{"file_name":"QuickTest.fst","start_pos":{"line":131,"col":3},"end_pos":{"line":134,"col":35}}},"number":19,"ctx":["While typechecking the top-level declaration `let va_lemma_Test2`","While typechecking the top-level declaration `[@@expect_failure] let va_lemma_Test2`"]}
diff --git a/tests/error-messages/QuickTest.fst.output.expected b/tests/error-messages/QuickTest.fst.output.expected
index 7e60a721284..2ad001c8928 100644
--- a/tests/error-messages/QuickTest.fst.output.expected
+++ b/tests/error-messages/QuickTest.fst.output.expected
@@ -1,7 +1,7 @@
-* Info at QuickTest.fst(131,2-134,34):
+* Info at QuickTest.fst:131.3-134.35:
   - Expected failure:
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: QuickTest(1,2-3,4)
-  - Other related locations: QuickTest.fst(116,12-116,20)
+  - Also see: QuickTest:1.2-3.4
+  - Other related locations: QuickTest.fst:116.13-116.21
 
diff --git a/tests/error-messages/QuickTestNBE.fst.json_output.expected b/tests/error-messages/QuickTestNBE.fst.json_output.expected
index 83e912fdab6..1f8d6c3832b 100644
--- a/tests/error-messages/QuickTestNBE.fst.json_output.expected
+++ b/tests/error-messages/QuickTestNBE.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: QuickTestNBE(1,2-3,4)","Other related locations: QuickTestNBE.fst(116,16-116,18)"],"level":"Info","range":{"def":{"file_name":"QuickTestNBE.fst","start_pos":{"line":131,"col":2},"end_pos":{"line":134,"col":34}},"use":{"file_name":"QuickTestNBE.fst","start_pos":{"line":131,"col":2},"end_pos":{"line":134,"col":34}}},"number":19,"ctx":["While typechecking the top-level declaration `let va_lemma_Test2`","While typechecking the top-level declaration `[@@expect_failure] let va_lemma_Test2`"]}
+{"msg":["Expected failure:","","The SMT solver could not prove the query. Use --query_stats for more details.","Also see: QuickTestNBE:1.2-3.4","Other related locations: QuickTestNBE.fst:116.17-116.19"],"level":"Info","range":{"def":{"file_name":"QuickTestNBE.fst","start_pos":{"line":131,"col":3},"end_pos":{"line":134,"col":35}},"use":{"file_name":"QuickTestNBE.fst","start_pos":{"line":131,"col":3},"end_pos":{"line":134,"col":35}}},"number":19,"ctx":["While typechecking the top-level declaration `let va_lemma_Test2`","While typechecking the top-level declaration `[@@expect_failure] let va_lemma_Test2`"]}
diff --git a/tests/error-messages/QuickTestNBE.fst.output.expected b/tests/error-messages/QuickTestNBE.fst.output.expected
index 53ee225112e..a24ce263a16 100644
--- a/tests/error-messages/QuickTestNBE.fst.output.expected
+++ b/tests/error-messages/QuickTestNBE.fst.output.expected
@@ -1,7 +1,7 @@
-* Info at QuickTestNBE.fst(131,2-134,34):
+* Info at QuickTestNBE.fst:131.3-134.35:
   - Expected failure:
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - Also see: QuickTestNBE(1,2-3,4)
-  - Other related locations: QuickTestNBE.fst(116,16-116,18)
+  - Also see: QuickTestNBE:1.2-3.4
+  - Other related locations: QuickTestNBE.fst:116.17-116.19
 
diff --git a/tests/error-messages/RecordFields.fst.json_output.expected b/tests/error-messages/RecordFields.fst.json_output.expected
index 8068f751d7d..76c94c4640c 100644
--- a/tests/error-messages/RecordFields.fst.json_output.expected
+++ b/tests/error-messages/RecordFields.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Expected failure:","No field 'd' in record type 'RecordFields.r'.",""],"level":"Info","range":{"def":{"file_name":"RecordFields.fst","start_pos":{"line":8,"col":29},"end_pos":{"line":8,"col":30}},"use":{"file_name":"RecordFields.fst","start_pos":{"line":8,"col":29},"end_pos":{"line":8,"col":30}}},"number":118,"ctx":["While typechecking the top-level declaration `let t2`","While typechecking the top-level declaration `[@@expect_failure] let t2`"]}
-{"msg":["Expected failure:","Missing fields for record type 'RecordFields.r': 'c'"],"level":"Info","range":{"def":{"file_name":"RecordFields.fst","start_pos":{"line":11,"col":14},"end_pos":{"line":11,"col":22}},"use":{"file_name":"RecordFields.fst","start_pos":{"line":11,"col":14},"end_pos":{"line":11,"col":22}}},"number":118,"ctx":["While typechecking the top-level declaration `let t3`","While typechecking the top-level declaration `[@@expect_failure] let t3`"]}
-{"msg":["Expected failure:","No field 'd' in record type 'RecordFields.r'.","Missing fields: 'c'"],"level":"Info","range":{"def":{"file_name":"RecordFields.fst","start_pos":{"line":14,"col":24},"end_pos":{"line":14,"col":25}},"use":{"file_name":"RecordFields.fst","start_pos":{"line":14,"col":24},"end_pos":{"line":14,"col":25}}},"number":118,"ctx":["While typechecking the top-level declaration `let t4`","While typechecking the top-level declaration `[@@expect_failure] let t4`"]}
+{"msg":["Expected failure:","No field 'd' in record type 'RecordFields.r'.",""],"level":"Info","range":{"def":{"file_name":"RecordFields.fst","start_pos":{"line":8,"col":30},"end_pos":{"line":8,"col":31}},"use":{"file_name":"RecordFields.fst","start_pos":{"line":8,"col":30},"end_pos":{"line":8,"col":31}}},"number":118,"ctx":["While typechecking the top-level declaration `let t2`","While typechecking the top-level declaration `[@@expect_failure] let t2`"]}
+{"msg":["Expected failure:","Missing fields for record type 'RecordFields.r': 'c'"],"level":"Info","range":{"def":{"file_name":"RecordFields.fst","start_pos":{"line":11,"col":15},"end_pos":{"line":11,"col":23}},"use":{"file_name":"RecordFields.fst","start_pos":{"line":11,"col":15},"end_pos":{"line":11,"col":23}}},"number":118,"ctx":["While typechecking the top-level declaration `let t3`","While typechecking the top-level declaration `[@@expect_failure] let t3`"]}
+{"msg":["Expected failure:","No field 'd' in record type 'RecordFields.r'.","Missing fields: 'c'"],"level":"Info","range":{"def":{"file_name":"RecordFields.fst","start_pos":{"line":14,"col":25},"end_pos":{"line":14,"col":26}},"use":{"file_name":"RecordFields.fst","start_pos":{"line":14,"col":25},"end_pos":{"line":14,"col":26}}},"number":118,"ctx":["While typechecking the top-level declaration `let t4`","While typechecking the top-level declaration `[@@expect_failure] let t4`"]}
diff --git a/tests/error-messages/RecordFields.fst.output.expected b/tests/error-messages/RecordFields.fst.output.expected
index 54f6fb1d0a3..157e6f5eab8 100644
--- a/tests/error-messages/RecordFields.fst.output.expected
+++ b/tests/error-messages/RecordFields.fst.output.expected
@@ -1,12 +1,12 @@
-* Info at RecordFields.fst(8,29-8,30):
+* Info at RecordFields.fst:8.30-8.31:
   - Expected failure:
   - No field 'd' in record type 'RecordFields.r'.
 
-* Info at RecordFields.fst(11,14-11,22):
+* Info at RecordFields.fst:11.15-11.23:
   - Expected failure:
   - Missing fields for record type 'RecordFields.r': 'c'
 
-* Info at RecordFields.fst(14,24-14,25):
+* Info at RecordFields.fst:14.25-14.26:
   - Expected failure:
   - No field 'd' in record type 'RecordFields.r'.
   - Missing fields: 'c'
diff --git a/tests/error-messages/ResolveImplicitsErrorPos.fst.json_output.expected b/tests/error-messages/ResolveImplicitsErrorPos.fst.json_output.expected
index 49f72287d7d..5eb00baede3 100644
--- a/tests/error-messages/ResolveImplicitsErrorPos.fst.json_output.expected
+++ b/tests/error-messages/ResolveImplicitsErrorPos.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Tactic failed","oops"],"level":"Info","range":{"def":{"file_name":"ResolveImplicitsErrorPos.fst","start_pos":{"line":15,"col":10},"end_pos":{"line":15,"col":11}},"use":{"file_name":"ResolveImplicitsErrorPos.fst","start_pos":{"line":15,"col":10},"end_pos":{"line":15,"col":11}}},"number":228,"ctx":["While solving implicits with a tactic","While solving deferred constraints","While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
+{"msg":["Expected failure:","Tactic failed","oops"],"level":"Info","range":{"def":{"file_name":"ResolveImplicitsErrorPos.fst","start_pos":{"line":15,"col":11},"end_pos":{"line":15,"col":12}},"use":{"file_name":"ResolveImplicitsErrorPos.fst","start_pos":{"line":15,"col":11},"end_pos":{"line":15,"col":12}}},"number":228,"ctx":["While solving implicits with a tactic","While solving deferred constraints","While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
diff --git a/tests/error-messages/ResolveImplicitsErrorPos.fst.output.expected b/tests/error-messages/ResolveImplicitsErrorPos.fst.output.expected
index e0f30bcd8d3..3914c7e0379 100644
--- a/tests/error-messages/ResolveImplicitsErrorPos.fst.output.expected
+++ b/tests/error-messages/ResolveImplicitsErrorPos.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at ResolveImplicitsErrorPos.fst(15,10-15,11):
+* Info at ResolveImplicitsErrorPos.fst:15.11-15.12:
   - Expected failure:
   - Tactic failed
   - oops
diff --git a/tests/error-messages/SMTPatSymbols.fst.json_output.expected b/tests/error-messages/SMTPatSymbols.fst.json_output.expected
index 12c39882316..bdea67d2a3d 100644
--- a/tests/error-messages/SMTPatSymbols.fst.json_output.expected
+++ b/tests/error-messages/SMTPatSymbols.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Pattern uses these theory symbols or terms that should not be in an SMT pattern:\n  Prims.op_Addition, Prims.op_Subtraction"],"level":"Warning","range":{"def":{"file_name":"SMTPatSymbols.fst","start_pos":{"line":3,"col":34},"end_pos":{"line":3,"col":52}},"use":{"file_name":"SMTPatSymbols.fst","start_pos":{"line":3,"col":34},"end_pos":{"line":3,"col":52}}},"number":271,"ctx":["While typechecking the top-level declaration `val SMTPatSymbols.lem`"]}
+{"msg":["Pattern uses these theory symbols or terms that should not be in an SMT pattern:\n  Prims.op_Addition, Prims.op_Subtraction"],"level":"Warning","range":{"def":{"file_name":"SMTPatSymbols.fst","start_pos":{"line":3,"col":35},"end_pos":{"line":3,"col":53}},"use":{"file_name":"SMTPatSymbols.fst","start_pos":{"line":3,"col":35},"end_pos":{"line":3,"col":53}}},"number":271,"ctx":["While typechecking the top-level declaration `val SMTPatSymbols.lem`"]}
diff --git a/tests/error-messages/SMTPatSymbols.fst.output.expected b/tests/error-messages/SMTPatSymbols.fst.output.expected
index 132070aeab1..8b2299b867d 100644
--- a/tests/error-messages/SMTPatSymbols.fst.output.expected
+++ b/tests/error-messages/SMTPatSymbols.fst.output.expected
@@ -1,4 +1,4 @@
-* Warning 271 at SMTPatSymbols.fst(3,34-3,52):
+* Warning 271 at SMTPatSymbols.fst:3.35-3.53:
   - Pattern uses these theory symbols or terms that should not be in an SMT
     pattern:
       Prims.op_Addition, Prims.op_Subtraction
diff --git a/tests/error-messages/SeqLit.fst.json_output.expected b/tests/error-messages/SeqLit.fst.json_output.expected
index ea74f025829..ff2a96d9b3c 100644
--- a/tests/error-messages/SeqLit.fst.json_output.expected
+++ b/tests/error-messages/SeqLit.fst.json_output.expected
@@ -1,4 +1,4 @@
-{"msg":["The operator '@' has been resolved to FStar.List.Tot.append even though\nFStar.List.Tot is not in scope. Please add an 'open FStar.List.Tot' to stop\nrelying on this deprecated, special treatment of '@'."],"level":"Warning","range":{"def":{"file_name":"SeqLit.fst","start_pos":{"line":8,"col":17},"end_pos":{"line":8,"col":18}},"use":{"file_name":"SeqLit.fst","start_pos":{"line":8,"col":17},"end_pos":{"line":8,"col":18}}},"number":337,"ctx":["While desugaring module SeqLit"]}
+{"msg":["The operator '@' has been resolved to FStar.List.Tot.append even though\nFStar.List.Tot is not in scope. Please add an 'open FStar.List.Tot' to stop\nrelying on this deprecated, special treatment of '@'."],"level":"Warning","range":{"def":{"file_name":"SeqLit.fst","start_pos":{"line":8,"col":18},"end_pos":{"line":8,"col":19}},"use":{"file_name":"SeqLit.fst","start_pos":{"line":8,"col":18},"end_pos":{"line":8,"col":19}}},"number":337,"ctx":["While desugaring module SeqLit"]}
 Module after desugaring:
 module SeqLit
 Declarations: [
diff --git a/tests/error-messages/SeqLit.fst.output.expected b/tests/error-messages/SeqLit.fst.output.expected
index 01bdfb3dd55..3e14bbdcdfc 100644
--- a/tests/error-messages/SeqLit.fst.output.expected
+++ b/tests/error-messages/SeqLit.fst.output.expected
@@ -1,4 +1,4 @@
-* Warning 337 at SeqLit.fst(8,17-8,18):
+* Warning 337 at SeqLit.fst:8.18-8.19:
   - The operator '@' has been resolved to FStar.List.Tot.append even though
     FStar.List.Tot is not in scope. Please add an 'open FStar.List.Tot' to stop
     relying on this deprecated, special treatment of '@'.
diff --git a/tests/error-messages/StableErr.fst.json_output.expected b/tests/error-messages/StableErr.fst.json_output.expected
index 92b4ff928e3..dc177fdc6ad 100644
--- a/tests/error-messages/StableErr.fst.json_output.expected
+++ b/tests/error-messages/StableErr.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","A query could not be solved internally, and --no_smt was given.","Query =\nPrims.l_False"],"level":"Info","range":{"def":{"file_name":"StableErr.fst","start_pos":{"line":26,"col":0},"end_pos":{"line":26,"col":20}},"use":{"file_name":"StableErr.fst","start_pos":{"line":26,"col":0},"end_pos":{"line":26,"col":20}}},"number":298,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
+{"msg":["Expected failure:","A query could not be solved internally, and --no_smt was given.","Query =\nPrims.l_False"],"level":"Info","range":{"def":{"file_name":"StableErr.fst","start_pos":{"line":26,"col":1},"end_pos":{"line":26,"col":21}},"use":{"file_name":"StableErr.fst","start_pos":{"line":26,"col":1},"end_pos":{"line":26,"col":21}}},"number":298,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___0`","While typechecking the top-level declaration `[@@expect_failure] let uu___0`"]}
diff --git a/tests/error-messages/StableErr.fst.output.expected b/tests/error-messages/StableErr.fst.output.expected
index 9b76ede97b3..ff77edad604 100644
--- a/tests/error-messages/StableErr.fst.output.expected
+++ b/tests/error-messages/StableErr.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at StableErr.fst(26,0-26,20):
+* Info at StableErr.fst:26.1-26.21:
   - Expected failure:
   - A query could not be solved internally, and --no_smt was given.
   - Query = Prims.l_False
diff --git a/tests/error-messages/StrictUnfolding.fst.json_output.expected b/tests/error-messages/StrictUnfolding.fst.json_output.expected
index 99811bbc523..73e676a872e 100644
--- a/tests/error-messages/StrictUnfolding.fst.json_output.expected
+++ b/tests/error-messages/StrictUnfolding.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Could not prove goal #1\n","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"StrictUnfolding.fst","start_pos":{"line":50,"col":48},"end_pos":{"line":50,"col":72}},"use":{"file_name":"StrictUnfolding.fst","start_pos":{"line":50,"col":2},"end_pos":{"line":50,"col":8}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_integer_generic_wo_fstar_integers`","While typechecking the top-level declaration `[@@expect_failure] let test_integer_generic_wo_fstar_integers`"]}
+{"msg":["Expected failure:","Could not prove goal #1\n","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"StrictUnfolding.fst","start_pos":{"line":50,"col":49},"end_pos":{"line":50,"col":73}},"use":{"file_name":"StrictUnfolding.fst","start_pos":{"line":50,"col":3},"end_pos":{"line":50,"col":9}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_integer_generic_wo_fstar_integers`","While typechecking the top-level declaration `[@@expect_failure] let test_integer_generic_wo_fstar_integers`"]}
diff --git a/tests/error-messages/StrictUnfolding.fst.output.expected b/tests/error-messages/StrictUnfolding.fst.output.expected
index 6454d2d95d1..6672311738a 100644
--- a/tests/error-messages/StrictUnfolding.fst.output.expected
+++ b/tests/error-messages/StrictUnfolding.fst.output.expected
@@ -1,7 +1,7 @@
-* Info at StrictUnfolding.fst(50,2-50,8):
+* Info at StrictUnfolding.fst:50.3-50.9:
   - Expected failure:
   - Could not prove goal #1
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also StrictUnfolding.fst(50,48-50,72)
+  - See also StrictUnfolding.fst:50.49-50.73
 
diff --git a/tests/error-messages/StringNormalization.fst.json_output.expected b/tests/error-messages/StringNormalization.fst.json_output.expected
index 18eb7f0ea74..2fa7d71b25b 100644
--- a/tests/error-messages/StringNormalization.fst.json_output.expected
+++ b/tests/error-messages/StringNormalization.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"StringNormalization.fst","start_pos":{"line":83,"col":9},"end_pos":{"line":83,"col":58}},"use":{"file_name":"StringNormalization.fst","start_pos":{"line":83,"col":2},"end_pos":{"line":83,"col":8}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___32`","While typechecking the top-level declaration `[@@expect_failure] let uu___32`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"StringNormalization.fst","start_pos":{"line":83,"col":10},"end_pos":{"line":83,"col":59}},"use":{"file_name":"StringNormalization.fst","start_pos":{"line":83,"col":3},"end_pos":{"line":83,"col":9}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let uu___32`","While typechecking the top-level declaration `[@@expect_failure] let uu___32`"]}
diff --git a/tests/error-messages/StringNormalization.fst.output.expected b/tests/error-messages/StringNormalization.fst.output.expected
index d5f079feb66..2c529a272ce 100644
--- a/tests/error-messages/StringNormalization.fst.output.expected
+++ b/tests/error-messages/StringNormalization.fst.output.expected
@@ -1,7 +1,7 @@
-* Info at StringNormalization.fst(83,2-83,8):
+* Info at StringNormalization.fst:83.3-83.9:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also StringNormalization.fst(83,9-83,58)
+  - See also StringNormalization.fst:83.10-83.59
 
diff --git a/tests/error-messages/Test.FunctionalExtensionality.fst.json_output.expected b/tests/error-messages/Test.FunctionalExtensionality.fst.json_output.expected
index 4cbdf4510b8..d1f560a8e33 100644
--- a/tests/error-messages/Test.FunctionalExtensionality.fst.json_output.expected
+++ b/tests/error-messages/Test.FunctionalExtensionality.fst.json_output.expected
@@ -1,4 +1,4 @@
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat ^-> Prims.int\ngot type Prims.int ^-> Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.FunctionalExtensionality.fsti","start_pos":{"line":102,"col":60},"end_pos":{"line":102,"col":77}},"use":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":36,"col":49},"end_pos":{"line":36,"col":50}}},"number":19,"ctx":["While typechecking the top-level declaration `let sub_fails`","While typechecking the top-level declaration `[@@expect_failure] let sub_fails`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":80,"col":9},"end_pos":{"line":80,"col":43}},"use":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":80,"col":2},"end_pos":{"line":80,"col":8}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let unable_to_extend_equality_to_larger_domains_1`","While typechecking the top-level declaration `[@@expect_failure] let unable_to_extend_equality_to_larger_domains_1`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type _: Prims.int -> Prims.int\ngot type Prims.nat ^-> Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":92,"col":36},"end_pos":{"line":92,"col":47}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let unable_to_extend_equality_to_larger_domains_2`","While typechecking the top-level declaration `[@@expect_failure] let unable_to_extend_equality_to_larger_domains_2`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.int ^-> Prims.int\ngot type Prims.int ^-> Prims.nat","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.FunctionalExtensionality.fsti","start_pos":{"line":102,"col":60},"end_pos":{"line":102,"col":77}},"use":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":142,"col":57},"end_pos":{"line":142,"col":58}}},"number":19,"ctx":["While typechecking the top-level declaration `let sub_currently_not`","While typechecking the top-level declaration `[@@expect_failure] let sub_currently_not`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat ^-> Prims.int\ngot type Prims.int ^-> Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.FunctionalExtensionality.fsti","start_pos":{"line":102,"col":61},"end_pos":{"line":102,"col":78}},"use":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":36,"col":50},"end_pos":{"line":36,"col":51}}},"number":19,"ctx":["While typechecking the top-level declaration `let sub_fails`","While typechecking the top-level declaration `[@@expect_failure] let sub_fails`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":80,"col":10},"end_pos":{"line":80,"col":44}},"use":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":80,"col":3},"end_pos":{"line":80,"col":9}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let unable_to_extend_equality_to_larger_domains_1`","While typechecking the top-level declaration `[@@expect_failure] let unable_to_extend_equality_to_larger_domains_1`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type _: Prims.int -> Prims.int\ngot type Prims.nat ^-> Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":92,"col":37},"end_pos":{"line":92,"col":48}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let unable_to_extend_equality_to_larger_domains_2`","While typechecking the top-level declaration `[@@expect_failure] let unable_to_extend_equality_to_larger_domains_2`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.int ^-> Prims.int\ngot type Prims.int ^-> Prims.nat","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.FunctionalExtensionality.fsti","start_pos":{"line":102,"col":61},"end_pos":{"line":102,"col":78}},"use":{"file_name":"Test.FunctionalExtensionality.fst","start_pos":{"line":142,"col":58},"end_pos":{"line":142,"col":59}}},"number":19,"ctx":["While typechecking the top-level declaration `let sub_currently_not`","While typechecking the top-level declaration `[@@expect_failure] let sub_currently_not`"]}
diff --git a/tests/error-messages/Test.FunctionalExtensionality.fst.output.expected b/tests/error-messages/Test.FunctionalExtensionality.fst.output.expected
index 3647be8e8dd..829886a7bfd 100644
--- a/tests/error-messages/Test.FunctionalExtensionality.fst.output.expected
+++ b/tests/error-messages/Test.FunctionalExtensionality.fst.output.expected
@@ -1,31 +1,31 @@
-* Info at Test.FunctionalExtensionality.fst(36,49-36,50):
+* Info at Test.FunctionalExtensionality.fst:36.50-36.51:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat ^-> Prims.int got type Prims.int ^-> Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also FStar.FunctionalExtensionality.fsti(102,60-102,77)
+  - See also FStar.FunctionalExtensionality.fsti:102.61-102.78
 
-* Info at Test.FunctionalExtensionality.fst(80,2-80,8):
+* Info at Test.FunctionalExtensionality.fst:80.3-80.9:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Test.FunctionalExtensionality.fst(80,9-80,43)
+  - See also Test.FunctionalExtensionality.fst:80.10-80.44
 
-* Info at Test.FunctionalExtensionality.fst(92,36-92,47):
+* Info at Test.FunctionalExtensionality.fst:92.37-92.48:
   - Expected failure:
   - Subtyping check failed
   - Expected type _: Prims.int -> Prims.int got type Prims.nat ^-> Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at Test.FunctionalExtensionality.fst(142,57-142,58):
+* Info at Test.FunctionalExtensionality.fst:142.58-142.59:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.int ^-> Prims.int got type Prims.int ^-> Prims.nat
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also FStar.FunctionalExtensionality.fsti(102,60-102,77)
+  - See also FStar.FunctionalExtensionality.fsti:102.61-102.78
 
diff --git a/tests/error-messages/TestErrorLocations.fst.json_output.expected b/tests/error-messages/TestErrorLocations.fst.json_output.expected
index 866b0296f66..8c10170f6c0 100644
--- a/tests/error-messages/TestErrorLocations.fst.json_output.expected
+++ b/tests/error-messages/TestErrorLocations.fst.json_output.expected
@@ -1,19 +1,19 @@
-{"msg":["TestErrorLocations.test7\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":60,"col":4},"end_pos":{"line":60,"col":9}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":60,"col":4},"end_pos":{"line":60,"col":9}}},"number":240,"ctx":["While desugaring module TestErrorLocations"]}
-{"msg":["TestErrorLocations.test6\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":56,"col":4},"end_pos":{"line":56,"col":9}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":56,"col":4},"end_pos":{"line":56,"col":9}}},"number":240,"ctx":["While desugaring module TestErrorLocations"]}
-{"msg":["TestErrorLocations.test5\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":46,"col":4},"end_pos":{"line":46,"col":9}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":46,"col":4},"end_pos":{"line":46,"col":9}}},"number":240,"ctx":["While desugaring module TestErrorLocations"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":20,"col":21},"end_pos":{"line":20,"col":23}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":20,"col":21},"end_pos":{"line":20,"col":23}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":24,"col":21},"end_pos":{"line":24,"col":23}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":24,"col":21},"end_pos":{"line":24,"col":23}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":27,"col":50},"end_pos":{"line":27,"col":58}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":31,"col":10},"end_pos":{"line":31,"col":19}}},"number":19,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":27,"col":50},"end_pos":{"line":27,"col":58}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":37,"col":10},"end_pos":{"line":37,"col":11}}},"number":19,"ctx":["While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":43,"col":20},"end_pos":{"line":43,"col":21}}},"number":19,"ctx":["While typechecking the top-level declaration `let test4`","While typechecking the top-level declaration `[@@expect_failure] let test4`"]}
-{"msg":["Expected failure:","Could not prove post-condition","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":46,"col":84},"end_pos":{"line":46,"col":90}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":48,"col":14},"end_pos":{"line":48,"col":19}}},"number":19,"ctx":["While typechecking the top-level declaration `let test5`","While typechecking the top-level declaration `[@@expect_failure] let test5`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":90},"end_pos":{"line":459,"col":102}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":58,"col":15},"end_pos":{"line":58,"col":17}}},"number":19,"ctx":["While typechecking the top-level declaration `let test6`","While typechecking the top-level declaration `[@@expect_failure] let test6`"]}
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":90},"end_pos":{"line":459,"col":102}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":62,"col":15},"end_pos":{"line":62,"col":17}}},"number":19,"ctx":["While typechecking the top-level declaration `let test7`","While typechecking the top-level declaration `[@@expect_failure] let test7`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":18},"end_pos":{"line":682,"col":24}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":66,"col":27},"end_pos":{"line":66,"col":28}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test8`","While typechecking the top-level declaration `[@@expect_failure] let test8`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Type0\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":68,"col":52},"end_pos":{"line":68,"col":66}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":70,"col":25},"end_pos":{"line":70,"col":34}}},"number":19,"ctx":["While typechecking the top-level declaration `val TestErrorLocations.test9`","While typechecking the top-level declaration `[@@expect_failure] val TestErrorLocations.test9`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (exists (x: Prims.nat). x = 0)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Classical.Sugar.fsti","start_pos":{"line":66,"col":22},"end_pos":{"line":66,"col":41}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":89,"col":20},"end_pos":{"line":89,"col":36}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_exists`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_exists`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (forall (x: Prims.nat). x = 0)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":97,"col":28},"end_pos":{"line":97,"col":33}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":97,"col":28},"end_pos":{"line":97,"col":33}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_forall`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_forall`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (p /\\ q)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":101,"col":19},"end_pos":{"line":101,"col":20}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":102,"col":12},"end_pos":{"line":102,"col":13}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_and`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_and`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (p /\\ q)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":107,"col":21},"end_pos":{"line":107,"col":22}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":108,"col":17},"end_pos":{"line":108,"col":18}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_and`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_and`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (p \\/ q)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Classical.Sugar.fsti","start_pos":{"line":88,"col":21},"end_pos":{"line":88,"col":31}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":114,"col":12},"end_pos":{"line":114,"col":18}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_or`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_or`"]}
-{"msg":["Missing definitions in module TestErrorLocations:\n  test5\n  test6\n  test7"],"level":"Warning","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":113,"col":0},"end_pos":{"line":117,"col":17}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":113,"col":0},"end_pos":{"line":117,"col":17}}},"number":240,"ctx":[]}
+{"msg":["TestErrorLocations.test7\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":60,"col":5},"end_pos":{"line":60,"col":10}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":60,"col":5},"end_pos":{"line":60,"col":10}}},"number":240,"ctx":["While desugaring module TestErrorLocations"]}
+{"msg":["TestErrorLocations.test6\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":56,"col":5},"end_pos":{"line":56,"col":10}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":56,"col":5},"end_pos":{"line":56,"col":10}}},"number":240,"ctx":["While desugaring module TestErrorLocations"]}
+{"msg":["TestErrorLocations.test5\nis declared but no definition was found","Add an 'assume' if this is intentional"],"level":"Warning","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":46,"col":5},"end_pos":{"line":46,"col":10}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":46,"col":5},"end_pos":{"line":46,"col":10}}},"number":240,"ctx":["While desugaring module TestErrorLocations"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":20,"col":22},"end_pos":{"line":20,"col":24}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":20,"col":22},"end_pos":{"line":20,"col":24}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":24,"col":22},"end_pos":{"line":24,"col":24}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":24,"col":22},"end_pos":{"line":24,"col":24}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":27,"col":51},"end_pos":{"line":27,"col":59}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":31,"col":11},"end_pos":{"line":31,"col":20}}},"number":19,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":27,"col":51},"end_pos":{"line":27,"col":59}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":37,"col":11},"end_pos":{"line":37,"col":12}}},"number":19,"ctx":["While typechecking the top-level declaration `let test3`","While typechecking the top-level declaration `[@@expect_failure] let test3`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":43,"col":21},"end_pos":{"line":43,"col":22}}},"number":19,"ctx":["While typechecking the top-level declaration `let test4`","While typechecking the top-level declaration `[@@expect_failure] let test4`"]}
+{"msg":["Expected failure:","Could not prove post-condition","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":46,"col":85},"end_pos":{"line":46,"col":91}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":48,"col":15},"end_pos":{"line":48,"col":20}}},"number":19,"ctx":["While typechecking the top-level declaration `let test5`","While typechecking the top-level declaration `[@@expect_failure] let test5`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":91},"end_pos":{"line":459,"col":103}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":58,"col":16},"end_pos":{"line":58,"col":18}}},"number":19,"ctx":["While typechecking the top-level declaration `let test6`","While typechecking the top-level declaration `[@@expect_failure] let test6`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":91},"end_pos":{"line":459,"col":103}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":62,"col":16},"end_pos":{"line":62,"col":18}}},"number":19,"ctx":["While typechecking the top-level declaration `let test7`","While typechecking the top-level declaration `[@@expect_failure] let test7`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.nat\ngot type Prims.int","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":682,"col":19},"end_pos":{"line":682,"col":25}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":66,"col":28},"end_pos":{"line":66,"col":29}}},"number":19,"ctx":["While checking for top-level effects","While typechecking the top-level declaration `let test8`","While typechecking the top-level declaration `[@@expect_failure] let test8`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Type0\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":68,"col":53},"end_pos":{"line":68,"col":67}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":70,"col":26},"end_pos":{"line":70,"col":35}}},"number":19,"ctx":["While typechecking the top-level declaration `val TestErrorLocations.test9`","While typechecking the top-level declaration `[@@expect_failure] val TestErrorLocations.test9`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (exists (x: Prims.nat). x = 0)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Classical.Sugar.fsti","start_pos":{"line":66,"col":23},"end_pos":{"line":66,"col":42}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":89,"col":21},"end_pos":{"line":89,"col":37}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_exists`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_exists`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (forall (x: Prims.nat). x = 0)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":97,"col":29},"end_pos":{"line":97,"col":34}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":97,"col":29},"end_pos":{"line":97,"col":34}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_forall`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_forall`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (p /\\ q)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":101,"col":20},"end_pos":{"line":101,"col":21}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":102,"col":13},"end_pos":{"line":102,"col":14}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_and`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_and`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (p /\\ q)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":107,"col":22},"end_pos":{"line":107,"col":23}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":108,"col":18},"end_pos":{"line":108,"col":19}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_and`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_and`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.squash (p \\/ q)\ngot type Prims.unit","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"FStar.Classical.Sugar.fsti","start_pos":{"line":88,"col":22},"end_pos":{"line":88,"col":32}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":114,"col":13},"end_pos":{"line":114,"col":19}}},"number":19,"ctx":["While typechecking the top-level declaration `let test_elim_or`","While typechecking the top-level declaration `[@@expect_failure] let test_elim_or`"]}
+{"msg":["Missing definitions in module TestErrorLocations:\n  test5\n  test6\n  test7"],"level":"Warning","range":{"def":{"file_name":"TestErrorLocations.fst","start_pos":{"line":113,"col":1},"end_pos":{"line":117,"col":18}},"use":{"file_name":"TestErrorLocations.fst","start_pos":{"line":113,"col":1},"end_pos":{"line":117,"col":18}}},"number":240,"ctx":[]}
diff --git a/tests/error-messages/TestErrorLocations.fst.output.expected b/tests/error-messages/TestErrorLocations.fst.output.expected
index 88b5c51fbe6..c68e6c880b8 100644
--- a/tests/error-messages/TestErrorLocations.fst.output.expected
+++ b/tests/error-messages/TestErrorLocations.fst.output.expected
@@ -1,96 +1,96 @@
-* Warning 240 at TestErrorLocations.fst(60,4-60,9):
+* Warning 240 at TestErrorLocations.fst:60.5-60.10:
   - TestErrorLocations.test7 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at TestErrorLocations.fst(56,4-56,9):
+* Warning 240 at TestErrorLocations.fst:56.5-56.10:
   - TestErrorLocations.test6 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Warning 240 at TestErrorLocations.fst(46,4-46,9):
+* Warning 240 at TestErrorLocations.fst:46.5-46.10:
   - TestErrorLocations.test5 is declared but no definition was found
   - Add an 'assume' if this is intentional
 
-* Info at TestErrorLocations.fst(20,21-20,23):
+* Info at TestErrorLocations.fst:20.22-20.24:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Info at TestErrorLocations.fst(24,21-24,23):
+* Info at TestErrorLocations.fst:24.22-24.24:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Info at TestErrorLocations.fst(31,10-31,19):
+* Info at TestErrorLocations.fst:31.11-31.20:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also TestErrorLocations.fst(27,50-27,58)
+  - See also TestErrorLocations.fst:27.51-27.59
 
-* Info at TestErrorLocations.fst(37,10-37,11):
+* Info at TestErrorLocations.fst:37.11-37.12:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also TestErrorLocations.fst(27,50-27,58)
+  - See also TestErrorLocations.fst:27.51-27.59
 
-* Info at TestErrorLocations.fst(43,20-43,21):
+* Info at TestErrorLocations.fst:43.21-43.22:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at TestErrorLocations.fst(48,14-48,19):
+* Info at TestErrorLocations.fst:48.15-48.20:
   - Expected failure:
   - Could not prove post-condition
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also TestErrorLocations.fst(46,84-46,90)
+  - See also TestErrorLocations.fst:46.85-46.91
 
-* Info at TestErrorLocations.fst(58,15-58,17):
+* Info at TestErrorLocations.fst:58.16-58.18:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(459,90-459,102)
+  - See also Prims.fst:459.91-459.103
 
-* Info at TestErrorLocations.fst(62,15-62,17):
+* Info at TestErrorLocations.fst:62.16-62.18:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(459,90-459,102)
+  - See also Prims.fst:459.91-459.103
 
-* Info at TestErrorLocations.fst(66,27-66,28):
+* Info at TestErrorLocations.fst:66.28-66.29:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.nat got type Prims.int
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(682,18-682,24)
+  - See also Prims.fst:682.19-682.25
 
-* Info at TestErrorLocations.fst(70,25-70,34):
+* Info at TestErrorLocations.fst:70.26-70.35:
   - Expected failure:
   - Subtyping check failed
   - Expected type Type0 got type Type0
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also TestErrorLocations.fst(68,52-68,66)
+  - See also TestErrorLocations.fst:68.53-68.67
 
-* Info at TestErrorLocations.fst(89,20-89,36):
+* Info at TestErrorLocations.fst:89.21-89.37:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash (exists (x: Prims.nat). x = 0)
     got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also FStar.Classical.Sugar.fsti(66,22-66,41)
+  - See also FStar.Classical.Sugar.fsti:66.23-66.42
 
-* Info at TestErrorLocations.fst(97,28-97,33):
+* Info at TestErrorLocations.fst:97.29-97.34:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash (forall (x: Prims.nat). x = 0)
@@ -98,31 +98,31 @@
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
 
-* Info at TestErrorLocations.fst(102,12-102,13):
+* Info at TestErrorLocations.fst:102.13-102.14:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash (p /\ q) got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also TestErrorLocations.fst(101,19-101,20)
+  - See also TestErrorLocations.fst:101.20-101.21
 
-* Info at TestErrorLocations.fst(108,17-108,18):
+* Info at TestErrorLocations.fst:108.18-108.19:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash (p /\ q) got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also TestErrorLocations.fst(107,21-107,22)
+  - See also TestErrorLocations.fst:107.22-107.23
 
-* Info at TestErrorLocations.fst(114,12-114,18):
+* Info at TestErrorLocations.fst:114.13-114.19:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.squash (p \/ q) got type Prims.unit
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also FStar.Classical.Sugar.fsti(88,21-88,31)
+  - See also FStar.Classical.Sugar.fsti:88.22-88.32
 
-* Warning 240 at TestErrorLocations.fst(113,0-117,17):
+* Warning 240 at TestErrorLocations.fst:113.1-117.18:
   - Missing definitions in module TestErrorLocations:
       test5
       test6
diff --git a/tests/error-messages/TestHasEq.fst.json_output.expected b/tests/error-messages/TestHasEq.fst.json_output.expected
index 3a315d44806..531d54c1c93 100644
--- a/tests/error-messages/TestHasEq.fst.json_output.expected
+++ b/tests/error-messages/TestHasEq.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Expected failure:","Failed to prove that the type\n'TestHasEq.t3'\nsupports decidable equality because of this argument.","Add either the 'noeq' or 'unopteq' qualifier","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestHasEq.fst","start_pos":{"line":57,"col":0},"end_pos":{"line":58,"col":19}},"use":{"file_name":"TestHasEq.fst","start_pos":{"line":58,"col":10},"end_pos":{"line":58,"col":11}}},"number":19,"ctx":["While typechecking the top-level declaration `type TestHasEq.t3`","While typechecking the top-level declaration `[@@expect_failure] type TestHasEq.t3`"]}
-{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.eqtype\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestHasEq.fst","start_pos":{"line":84,"col":12},"end_pos":{"line":84,"col":22}},"use":{"file_name":"TestHasEq.fst","start_pos":{"line":84,"col":10},"end_pos":{"line":84,"col":70}}},"number":19,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
-{"msg":["Expected failure:","Invalid qualifiers for declaration `type TestHasEq.erasable_t2`","The `unopteq` qualifier is not allowed on erasable inductives since they don't\nhave decidable equality."],"level":"Info","range":{"def":{"file_name":"TestHasEq.fst","start_pos":{"line":88,"col":8},"end_pos":{"line":89,"col":30}},"use":{"file_name":"TestHasEq.fst","start_pos":{"line":88,"col":8},"end_pos":{"line":89,"col":30}}},"number":162,"ctx":["While typechecking the top-level declaration `type TestHasEq.erasable_t2`","While typechecking the top-level declaration `[@@expect_failure] type TestHasEq.erasable_t2`"]}
+{"msg":["Expected failure:","Failed to prove that the type\n'TestHasEq.t3'\nsupports decidable equality because of this argument.","Add either the 'noeq' or 'unopteq' qualifier","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestHasEq.fst","start_pos":{"line":57,"col":1},"end_pos":{"line":58,"col":20}},"use":{"file_name":"TestHasEq.fst","start_pos":{"line":58,"col":11},"end_pos":{"line":58,"col":12}}},"number":19,"ctx":["While typechecking the top-level declaration `type TestHasEq.t3`","While typechecking the top-level declaration `[@@expect_failure] type TestHasEq.t3`"]}
+{"msg":["Expected failure:","Subtyping check failed","Expected type Prims.eqtype\ngot type Type0","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"TestHasEq.fst","start_pos":{"line":84,"col":13},"end_pos":{"line":84,"col":23}},"use":{"file_name":"TestHasEq.fst","start_pos":{"line":84,"col":11},"end_pos":{"line":84,"col":71}}},"number":19,"ctx":["While typechecking the top-level declaration `let test`","While typechecking the top-level declaration `[@@expect_failure] let test`"]}
+{"msg":["Expected failure:","Invalid qualifiers for declaration `type TestHasEq.erasable_t2`","The `unopteq` qualifier is not allowed on erasable inductives since they don't\nhave decidable equality."],"level":"Info","range":{"def":{"file_name":"TestHasEq.fst","start_pos":{"line":88,"col":9},"end_pos":{"line":89,"col":31}},"use":{"file_name":"TestHasEq.fst","start_pos":{"line":88,"col":9},"end_pos":{"line":89,"col":31}}},"number":162,"ctx":["While typechecking the top-level declaration `type TestHasEq.erasable_t2`","While typechecking the top-level declaration `[@@expect_failure] type TestHasEq.erasable_t2`"]}
diff --git a/tests/error-messages/TestHasEq.fst.output.expected b/tests/error-messages/TestHasEq.fst.output.expected
index 795a0d05bbb..739b288a804 100644
--- a/tests/error-messages/TestHasEq.fst.output.expected
+++ b/tests/error-messages/TestHasEq.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at TestHasEq.fst(58,10-58,11):
+* Info at TestHasEq.fst:58.11-58.12:
   - Expected failure:
   - Failed to prove that the type
     'TestHasEq.t3'
@@ -6,17 +6,17 @@
   - Add either the 'noeq' or 'unopteq' qualifier
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also TestHasEq.fst(57,0-58,19)
+  - See also TestHasEq.fst:57.1-58.20
 
-* Info at TestHasEq.fst(84,10-84,70):
+* Info at TestHasEq.fst:84.11-84.71:
   - Expected failure:
   - Subtyping check failed
   - Expected type Prims.eqtype got type Type0
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also TestHasEq.fst(84,12-84,22)
+  - See also TestHasEq.fst:84.13-84.23
 
-* Info at TestHasEq.fst(88,8-89,30):
+* Info at TestHasEq.fst:88.9-89.31:
   - Expected failure:
   - Invalid qualifiers for declaration `type TestHasEq.erasable_t2`
   - The `unopteq` qualifier is not allowed on erasable inductives since they
diff --git a/tests/error-messages/UnboundOp.fst.json_output.expected b/tests/error-messages/UnboundOp.fst.json_output.expected
index 6e42d20738e..456f5cf3f0c 100644
--- a/tests/error-messages/UnboundOp.fst.json_output.expected
+++ b/tests/error-messages/UnboundOp.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Unexpected or unbound operator: ^%^"],"level":"Info","range":{"def":{"file_name":"UnboundOp.fst","start_pos":{"line":4,"col":10},"end_pos":{"line":4,"col":13}},"use":{"file_name":"UnboundOp.fst","start_pos":{"line":4,"col":10},"end_pos":{"line":4,"col":13}}},"number":180,"ctx":["While desugaring module UnboundOp"]}
+{"msg":["Expected failure:","Unexpected or unbound operator: ^%^"],"level":"Info","range":{"def":{"file_name":"UnboundOp.fst","start_pos":{"line":4,"col":11},"end_pos":{"line":4,"col":14}},"use":{"file_name":"UnboundOp.fst","start_pos":{"line":4,"col":11},"end_pos":{"line":4,"col":14}}},"number":180,"ctx":["While desugaring module UnboundOp"]}
diff --git a/tests/error-messages/UnboundOp.fst.output.expected b/tests/error-messages/UnboundOp.fst.output.expected
index 27adb91c8ee..d3a687896e9 100644
--- a/tests/error-messages/UnboundOp.fst.output.expected
+++ b/tests/error-messages/UnboundOp.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at UnboundOp.fst(4,10-4,13):
+* Info at UnboundOp.fst:4.11-4.14:
   - Expected failure:
   - Unexpected or unbound operator: ^%^
 
diff --git a/tests/error-messages/Unit2.fst.json_output.expected b/tests/error-messages/Unit2.fst.json_output.expected
index 2ea409b0cdf..489dfa0e9c1 100644
--- a/tests/error-messages/Unit2.fst.json_output.expected
+++ b/tests/error-messages/Unit2.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Unit2.fst","start_pos":{"line":37,"col":21},"end_pos":{"line":38,"col":60}},"use":{"file_name":"Unit2.fst","start_pos":{"line":37,"col":21},"end_pos":{"line":38,"col":60}}},"number":19,"ctx":["While typechecking the top-level declaration `let test6`","While typechecking the top-level declaration `[@@expect_failure] let test6`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Unit2.fst","start_pos":{"line":37,"col":22},"end_pos":{"line":38,"col":61}},"use":{"file_name":"Unit2.fst","start_pos":{"line":37,"col":22},"end_pos":{"line":38,"col":61}}},"number":19,"ctx":["While typechecking the top-level declaration `let test6`","While typechecking the top-level declaration `[@@expect_failure] let test6`"]}
diff --git a/tests/error-messages/Unit2.fst.output.expected b/tests/error-messages/Unit2.fst.output.expected
index a36c96382f4..22e0260c8b4 100644
--- a/tests/error-messages/Unit2.fst.output.expected
+++ b/tests/error-messages/Unit2.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at Unit2.fst(37,21-38,60):
+* Info at Unit2.fst:37.22-38.61:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
diff --git a/tests/error-messages/UnivInst.fst.output.expected b/tests/error-messages/UnivInst.fst.output.expected
index 6f410cc6fda..59766734ee5 100644
--- a/tests/error-messages/UnivInst.fst.output.expected
+++ b/tests/error-messages/UnivInst.fst.output.expected
@@ -1,27 +1,27 @@
-* Info at UnivInst.fst(8,8-8,10):
+* Info at UnivInst.fst:8.9-8.11:
   - Expected failure:
   - Unexpected number of universe instantiations for "id" (2 vs 1)
-  - See also UnivInst.fst(5,4-5,6)
+  - See also UnivInst.fst:5.5-5.7
 
-* Info at UnivInst.fst(13,16-13,19):
+* Info at UnivInst.fst:13.17-13.20:
   - Expected failure:
   - Expected expression of type Type
     got expression Prims.int
     of type Prims.eqtype
 
-* Info at UnivInst.fst(18,8-18,11):
+* Info at UnivInst.fst:18.9-18.12:
   - Expected failure:
   - Unexpected number of universe instantiations for "foo" (1 vs 2)
-  - See also UnivInst.fst(15,4-15,7)
+  - See also UnivInst.fst:15.5-15.8
 
-* Info at UnivInst.fst(23,22-23,26):
+* Info at UnivInst.fst:23.23-23.27:
   - Expected failure:
   - Expected expression of type Type
     got expression Prims.bool
     of type Prims.eqtype
 
-* Info at UnivInst.fst(26,8-26,11):
+* Info at UnivInst.fst:26.9-26.12:
   - Expected failure:
   - Unexpected number of universe instantiations for "foo" (3 vs 2)
-  - See also UnivInst.fst(15,4-15,7)
+  - See also UnivInst.fst:15.5-15.8
 
diff --git a/tests/error-messages/UnresolvedFields.fst.json_output.expected b/tests/error-messages/UnresolvedFields.fst.json_output.expected
index 62a8d3f25ad..058d749218b 100644
--- a/tests/error-messages/UnresolvedFields.fst.json_output.expected
+++ b/tests/error-messages/UnresolvedFields.fst.json_output.expected
@@ -1,3 +1,3 @@
-{"msg":["Expected failure:","Field name c could not be resolved."],"level":"Info","range":{"def":{"file_name":"UnresolvedFields.fst","start_pos":{"line":10,"col":4},"end_pos":{"line":10,"col":5}},"use":{"file_name":"UnresolvedFields.fst","start_pos":{"line":10,"col":4},"end_pos":{"line":10,"col":5}}},"number":360,"ctx":["While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
-{"msg":["Expected failure:","No field 'c' in record type 'UnresolvedFields.t'.",""],"level":"Info","range":{"def":{"file_name":"UnresolvedFields.fst","start_pos":{"line":17,"col":4},"end_pos":{"line":17,"col":5}},"use":{"file_name":"UnresolvedFields.fst","start_pos":{"line":17,"col":4},"end_pos":{"line":17,"col":5}}},"number":118,"ctx":["While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
-{"msg":["Expected failure:","No field 'c' in record type 'UnresolvedFields.t'.",""],"level":"Info","range":{"def":{"file_name":"UnresolvedFields.fst","start_pos":{"line":26,"col":4},"end_pos":{"line":26,"col":5}},"use":{"file_name":"UnresolvedFields.fst","start_pos":{"line":26,"col":4},"end_pos":{"line":26,"col":5}}},"number":118,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
+{"msg":["Expected failure:","Field name c could not be resolved."],"level":"Info","range":{"def":{"file_name":"UnresolvedFields.fst","start_pos":{"line":10,"col":5},"end_pos":{"line":10,"col":6}},"use":{"file_name":"UnresolvedFields.fst","start_pos":{"line":10,"col":5},"end_pos":{"line":10,"col":6}}},"number":360,"ctx":["While typechecking the top-level declaration `let test0`","While typechecking the top-level declaration `[@@expect_failure] let test0`"]}
+{"msg":["Expected failure:","No field 'c' in record type 'UnresolvedFields.t'.",""],"level":"Info","range":{"def":{"file_name":"UnresolvedFields.fst","start_pos":{"line":17,"col":5},"end_pos":{"line":17,"col":6}},"use":{"file_name":"UnresolvedFields.fst","start_pos":{"line":17,"col":5},"end_pos":{"line":17,"col":6}}},"number":118,"ctx":["While typechecking the top-level declaration `let test1`","While typechecking the top-level declaration `[@@expect_failure] let test1`"]}
+{"msg":["Expected failure:","No field 'c' in record type 'UnresolvedFields.t'.",""],"level":"Info","range":{"def":{"file_name":"UnresolvedFields.fst","start_pos":{"line":26,"col":5},"end_pos":{"line":26,"col":6}},"use":{"file_name":"UnresolvedFields.fst","start_pos":{"line":26,"col":5},"end_pos":{"line":26,"col":6}}},"number":118,"ctx":["While typechecking the top-level declaration `let test2`","While typechecking the top-level declaration `[@@expect_failure] let test2`"]}
diff --git a/tests/error-messages/UnresolvedFields.fst.output.expected b/tests/error-messages/UnresolvedFields.fst.output.expected
index 816ab1febe9..3ee6b7d6778 100644
--- a/tests/error-messages/UnresolvedFields.fst.output.expected
+++ b/tests/error-messages/UnresolvedFields.fst.output.expected
@@ -1,12 +1,12 @@
-* Info at UnresolvedFields.fst(10,4-10,5):
+* Info at UnresolvedFields.fst:10.5-10.6:
   - Expected failure:
   - Field name c could not be resolved.
 
-* Info at UnresolvedFields.fst(17,4-17,5):
+* Info at UnresolvedFields.fst:17.5-17.6:
   - Expected failure:
   - No field 'c' in record type 'UnresolvedFields.t'.
 
-* Info at UnresolvedFields.fst(26,4-26,5):
+* Info at UnresolvedFields.fst:26.5-26.6:
   - Expected failure:
   - No field 'c' in record type 'UnresolvedFields.t'.
 
diff --git a/tests/error-messages/WPExtensionality.fst.json_output.expected b/tests/error-messages/WPExtensionality.fst.json_output.expected
index 8263f604896..8230a028090 100644
--- a/tests/error-messages/WPExtensionality.fst.json_output.expected
+++ b/tests/error-messages/WPExtensionality.fst.json_output.expected
@@ -1 +1 @@
-{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":90},"end_pos":{"line":459,"col":102}},"use":{"file_name":"WPExtensionality.fst","start_pos":{"line":61,"col":3},"end_pos":{"line":61,"col":34}}},"number":19,"ctx":["While typechecking the top-level declaration `let bug`","While typechecking the top-level declaration `[@@expect_failure] let bug`"]}
+{"msg":["Expected failure:","Assertion failed","The SMT solver could not prove the query. Use --query_stats for more details."],"level":"Info","range":{"def":{"file_name":"Prims.fst","start_pos":{"line":459,"col":91},"end_pos":{"line":459,"col":103}},"use":{"file_name":"WPExtensionality.fst","start_pos":{"line":61,"col":4},"end_pos":{"line":61,"col":35}}},"number":19,"ctx":["While typechecking the top-level declaration `let bug`","While typechecking the top-level declaration `[@@expect_failure] let bug`"]}
diff --git a/tests/error-messages/WPExtensionality.fst.output.expected b/tests/error-messages/WPExtensionality.fst.output.expected
index c904e5ff507..4b9c5c9750b 100644
--- a/tests/error-messages/WPExtensionality.fst.output.expected
+++ b/tests/error-messages/WPExtensionality.fst.output.expected
@@ -1,7 +1,7 @@
-* Info at WPExtensionality.fst(61,3-61,34):
+* Info at WPExtensionality.fst:61.4-61.35:
   - Expected failure:
   - Assertion failed
   - The SMT solver could not prove the query. Use --query_stats for more
     details.
-  - See also Prims.fst(459,90-459,102)
+  - See also Prims.fst:459.91-459.103
 
diff --git a/tests/error-messages/WarnError.fst.output.expected b/tests/error-messages/WarnError.fst.output.expected
index c07cbede036..cf0285444ae 100644
--- a/tests/error-messages/WarnError.fst.output.expected
+++ b/tests/error-messages/WarnError.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at WarnError.fst(4,0-4,29):
+* Info at WarnError.fst:4.1-4.30:
   - Expected failure:
   - Failed to process pragma: Invalid --warn_error setting: Parsing of
     warn_error string failed
diff --git a/tests/ide/emacs/Backtracking.refinements.ideout.expected b/tests/ide/emacs/Backtracking.refinements.ideout.expected
index 58949a22353..c0f0e927581 100644
--- a/tests/ide/emacs/Backtracking.refinements.ideout.expected
+++ b/tests/ide/emacs/Backtracking.refinements.ideout.expected
@@ -16,15 +16,15 @@
 {"kind": "response", "query-id": "15", "response": [{"level": "error", "message": "- Syntax error\n", "number": 168, "ranges": [{"beg": [3, 15], "end": [3, 15], "fname": "Backtracking.fst"}]}], "status": "success"}
 {"kind": "response", "query-id": "16", "response": [{"level": "error", "message": "- Syntax error\n", "number": 168, "ranges": [{"beg": [3, 15], "end": [3, 15], "fname": "Backtracking.fst"}]}], "status": "success"}
 {"kind": "response", "query-id": "17", "response": [], "status": "success"}
-{"kind": "response", "query-id": "18", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 2} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst(3,14-3,19)\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 24], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "18", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 2} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst:3.15-3.20\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 24], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "19", "response": [], "status": "success"}
 {"kind": "response", "query-id": "20", "response": [], "status": "success"}
-{"kind": "response", "query-id": "21", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 1} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst(3,14-3,19)\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 24], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "21", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 1} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst:3.15-3.20\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 24], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "22", "response": [], "status": "success"}
 {"kind": "response", "query-id": "23", "response": [], "status": "success"}
 {"kind": "response", "query-id": "24", "response": null, "status": "success"}
 {"kind": "response", "query-id": "25", "response": [], "status": "success"}
-{"kind": "response", "query-id": "26", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst(3,14-3,19)\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 25], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "26", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst:3.15-3.20\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 25], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "27", "response": [], "status": "success"}
 {"kind": "response", "query-id": "28", "response": [], "status": "success"}
 {"kind": "response", "query-id": "29", "response": [], "status": "success"}
@@ -43,7 +43,7 @@
 {"kind": "response", "query-id": "42", "response": [], "status": "success"}
 {"kind": "response", "query-id": "43", "response": [], "status": "success"}
 {"kind": "response", "query-id": "44", "response": [], "status": "success"}
-{"kind": "response", "query-id": "45", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type b: nat{b > 1} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst(5,13-5,18)\n", "number": 19, "ranges": [{"beg": [5, 22], "end": [5, 31], "fname": "Backtracking.fst"}, {"beg": [5, 13], "end": [5, 18], "fname": "Backtracking.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "45", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type b: nat{b > 1} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst:5.14-5.19\n", "number": 19, "ranges": [{"beg": [5, 22], "end": [5, 31], "fname": "Backtracking.fst"}, {"beg": [5, 13], "end": [5, 18], "fname": "Backtracking.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "46", "response": [], "status": "success"}
 {"kind": "response", "query-id": "47", "response": [], "status": "success"}
 {"kind": "response", "query-id": "48", "response": [], "status": "success"}
@@ -53,7 +53,7 @@
 {"kind": "response", "query-id": "52", "response": [], "status": "success"}
 {"kind": "response", "query-id": "53", "response": null, "status": "success"}
 {"kind": "response", "query-id": "54", "response": [], "status": "success"}
-{"kind": "response", "query-id": "55", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type b: nat{b > 1} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst(5,13-5,18)\n", "number": 19, "ranges": [{"beg": [5, 22], "end": [5, 31], "fname": "Backtracking.fst"}, {"beg": [5, 13], "end": [5, 18], "fname": "Backtracking.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "55", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type b: nat{b > 1} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst:5.14-5.19\n", "number": 19, "ranges": [{"beg": [5, 22], "end": [5, 31], "fname": "Backtracking.fst"}, {"beg": [5, 13], "end": [5, 18], "fname": "Backtracking.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "56", "response": null, "status": "success"}
 {"kind": "response", "query-id": "57", "response": [], "status": "success"}
 {"kind": "response", "query-id": "58", "response": [], "status": "success"}
@@ -61,12 +61,12 @@
 {"kind": "response", "query-id": "60", "response": null, "status": "success"}
 {"kind": "response", "query-id": "61", "response": null, "status": "success"}
 {"kind": "response", "query-id": "62", "response": [], "status": "success"}
-{"kind": "response", "query-id": "63", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst(3,14-3,19)\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 25], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "63", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst:3.15-3.20\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 25], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "64", "response": [], "status": "success"}
-{"kind": "response", "query-id": "65", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst(3,14-3,19)\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 24], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "65", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: nat{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst:3.15-3.20\n", "number": 19, "ranges": [{"beg": [3, 23], "end": [3, 24], "fname": "Backtracking.fst"}, {"beg": [3, 14], "end": [3, 19], "fname": "Backtracking.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "66", "response": [], "status": "success"}
 {"kind": "response", "query-id": "67", "response": [], "status": "success"}
-{"kind": "response", "query-id": "68", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type b: nat{b > 1} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst(5,13-5,18)\n", "number": 19, "ranges": [{"beg": [5, 22], "end": [5, 31], "fname": "Backtracking.fst"}, {"beg": [5, 13], "end": [5, 18], "fname": "Backtracking.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "68", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type b: nat{b > 1} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Backtracking.fst:5.14-5.19\n", "number": 19, "ranges": [{"beg": [5, 22], "end": [5, 31], "fname": "Backtracking.fst"}, {"beg": [5, 13], "end": [5, 18], "fname": "Backtracking.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "69", "response": null, "status": "success"}
 {"kind": "response", "query-id": "70", "response": [], "status": "success"}
 {"kind": "response", "query-id": "71", "response": [], "status": "success"}
diff --git a/tests/ide/emacs/FStarMode_GH73.ideout.expected b/tests/ide/emacs/FStarMode_GH73.ideout.expected
index fd0afe1d020..6d07462cc47 100644
--- a/tests/ide/emacs/FStarMode_GH73.ideout.expected
+++ b/tests/ide/emacs/FStarMode_GH73.ideout.expected
@@ -4,4 +4,4 @@
 {"kind": "response", "query-id": "3", "response": [{"level": "error", "message": "- Expected expression of type int got expression \"A\" of type string\n", "number": 189, "ranges": [{"beg": [4, 48], "end": [4, 51], "fname": "FStarMode_GH73.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "4", "response": [], "status": "success"}
 {"contents": {"depth": 0, "goals": [{"goal": {"label": "", "type": "bool", "witness": "(*?u[...]*)_"}, "hyps": []}], "label": "at the time of failure", "location": {"beg": [4, 14], "end": [4, 57], "fname": "FStarMode_GH73.fst"}, "smt-goals": [], "urgency": 1}, "kind": "message", "level": "proof-state", "query-id": "5"}
-{"kind": "response", "query-id": "5", "response": [{"level": "error", "message": "- Tactic failed\n- 'exact' failed\n- Term 1 of type int does not exactly solve the goal bool\n- See also FStarMode_GH73.fst(4,14-4,57)\n", "number": 228, "ranges": [{"beg": [4, 14], "end": [4, 29], "fname": "FStarMode_GH73.fst"}, {"beg": [4, 14], "end": [4, 57], "fname": "FStarMode_GH73.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "5", "response": [{"level": "error", "message": "- Tactic failed\n- 'exact' failed\n- Term 1 of type int does not exactly solve the goal bool\n- See also FStarMode_GH73.fst:4.15-4.58\n", "number": 228, "ranges": [{"beg": [4, 14], "end": [4, 29], "fname": "FStarMode_GH73.fst"}, {"beg": [4, 14], "end": [4, 57], "fname": "FStarMode_GH73.fst"}]}], "status": "failure"}
diff --git a/tests/ide/emacs/Harness.selfref.ideout.expected b/tests/ide/emacs/Harness.selfref.ideout.expected
index 710b677bdd7..8fd0d4d40c4 100644
--- a/tests/ide/emacs/Harness.selfref.ideout.expected
+++ b/tests/ide/emacs/Harness.selfref.ideout.expected
@@ -1,4 +1,4 @@
 {"kind": "protocol-info", "rest": "[...]"}
 {"kind": "response", "query-id": "1", "response": [], "status": "success"}
-{"kind": "response", "query-id": "2", "response": [{"level": "error", "message": "- Could not prove post-condition\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Harness.fst(1,25-1,32)\n", "number": 19, "ranges": [{"beg": [1, 35], "end": [1, 37], "fname": "Harness.fst"}, {"beg": [1, 25], "end": [1, 32], "fname": "Harness.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "2", "response": [{"level": "error", "message": "- Could not prove post-condition\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Harness.fst:1.26-1.33\n", "number": 19, "ranges": [{"beg": [1, 35], "end": [1, 37], "fname": "Harness.fst"}, {"beg": [1, 25], "end": [1, 32], "fname": "Harness.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "3", "response": [{"level": "error", "message": "- Module name Harness resolved to Harness which is not in scope.\n", "number": 72, "ranges": [{"beg": [1, 35], "end": [1, 42], "fname": "Harness.fst"}]}], "status": "failure"}
diff --git a/tests/ide/emacs/Integration.push-pop.ideout.expected b/tests/ide/emacs/Integration.push-pop.ideout.expected
index 8074cae93e5..bdbbebe612a 100644
--- a/tests/ide/emacs/Integration.push-pop.ideout.expected
+++ b/tests/ide/emacs/Integration.push-pop.ideout.expected
@@ -78,17 +78,17 @@
 {"kind": "response", "query-id": "80", "response": [], "status": "success"}
 {"kind": "response", "query-id": "91", "response": [{"level": "error", "message": "- Syntax error\n", "number": 168, "ranges": [{"beg": [12, 0], "end": [12, 0], "fname": "Integration.fst"}]}], "status": "success"}
 {"kind": "response", "query-id": "98", "response": [], "status": "success"}
-{"kind": "response", "query-id": "101", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type nat got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Prims.fst(682,18-682,24)\n", "number": 19, "ranges": [{"beg": [11, 15], "end": [11, 17], "fname": "Integration.fst"}, {"beg": [682, 18], "end": [682, 24], "fname": "Prims.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "101", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type nat got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Prims.fst:682.19-682.25\n", "number": 19, "ranges": [{"beg": [11, 15], "end": [11, 17], "fname": "Integration.fst"}, {"beg": [682, 18], "end": [682, 24], "fname": "Prims.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "107", "response": [], "status": "success"}
 {"kind": "response", "query-id": "108", "response": [], "status": "success"}
 {"kind": "response", "query-id": "112", "response": null, "status": "success"}
 {"kind": "response", "query-id": "114", "response": [], "status": "success"}
-{"kind": "response", "query-id": "116", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type nat got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Prims.fst(682,18-682,24)\n", "number": 19, "ranges": [{"beg": [11, 15], "end": [11, 17], "fname": "Integration.fst"}, {"beg": [682, 18], "end": [682, 24], "fname": "Prims.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "116", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type nat got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Prims.fst:682.19-682.25\n", "number": 19, "ranges": [{"beg": [11, 15], "end": [11, 17], "fname": "Integration.fst"}, {"beg": [682, 18], "end": [682, 24], "fname": "Prims.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "118", "response": [], "status": "success"}
 {"kind": "response", "query-id": "119", "response": [], "status": "success"}
 {"kind": "response", "query-id": "122", "response": null, "status": "success"}
 {"kind": "response", "query-id": "124", "response": [], "status": "success"}
-{"kind": "response", "query-id": "126", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type nat got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Prims.fst(682,18-682,24)\n", "number": 19, "ranges": [{"beg": [11, 15], "end": [11, 17], "fname": "Integration.fst"}, {"beg": [682, 18], "end": [682, 24], "fname": "Prims.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "126", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type nat got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Prims.fst:682.19-682.25\n", "number": 19, "ranges": [{"beg": [11, 15], "end": [11, 17], "fname": "Integration.fst"}, {"beg": [682, 18], "end": [682, 24], "fname": "Prims.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "128", "response": [], "status": "success"}
 {"kind": "response", "query-id": "130", "response": [], "status": "success"}
 {"kind": "response", "query-id": "133", "response": [], "status": "success"}
@@ -96,20 +96,20 @@
 {"kind": "response", "query-id": "159", "response": [{"level": "error", "message": "- Expected expression of type Type0 got expression xx of type nat\n", "number": 189, "ranges": [{"beg": [13, 15], "end": [13, 20], "fname": "Integration.fst"}]}], "status": "success"}
 {"kind": "response", "query-id": "163", "response": [], "status": "success"}
 {"kind": "response", "query-id": "164", "response": [], "status": "success"}
-{"kind": "response", "query-id": "165", "response": [{"level": "error", "message": "- Assertion failed\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Integration.fst(13,15-13,23)\n", "number": 19, "ranges": [{"beg": [13, 8], "end": [13, 14], "fname": "Integration.fst"}, {"beg": [13, 15], "end": [13, 23], "fname": "Integration.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "165", "response": [{"level": "error", "message": "- Assertion failed\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Integration.fst:13.16-13.24\n", "number": 19, "ranges": [{"beg": [13, 8], "end": [13, 14], "fname": "Integration.fst"}, {"beg": [13, 15], "end": [13, 23], "fname": "Integration.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "170", "response": [], "status": "success"}
 {"kind": "response", "query-id": "175", "response": [{"level": "error", "message": "- Unexpected numeric literal.  Restart F* to load FStar.UInt8.\n", "number": 201, "ranges": [{"beg": [13, 22], "end": [13, 24], "fname": "Integration.fst"}]}], "status": "success"}
 {"kind": "response", "query-id": "179", "response": [], "status": "success"}
-{"kind": "response", "query-id": "180", "response": [{"level": "error", "message": "- Assertion failed\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Integration.fst(13,15-13,24)\n", "number": 19, "ranges": [{"beg": [13, 8], "end": [13, 14], "fname": "Integration.fst"}, {"beg": [13, 15], "end": [13, 24], "fname": "Integration.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "180", "response": [{"level": "error", "message": "- Assertion failed\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Integration.fst:13.16-13.25\n", "number": 19, "ranges": [{"beg": [13, 8], "end": [13, 14], "fname": "Integration.fst"}, {"beg": [13, 15], "end": [13, 24], "fname": "Integration.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "185", "response": [], "status": "success"}
 {"kind": "response", "query-id": "186", "response": [], "status": "success"}
 {"kind": "response", "query-id": "191", "response": null, "status": "success"}
 {"kind": "response", "query-id": "192", "response": null, "status": "success"}
 {"kind": "response", "query-id": "194", "response": [], "status": "success"}
-{"kind": "response", "query-id": "198", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type nat got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Prims.fst(682,18-682,24)\n", "number": 19, "ranges": [{"beg": [11, 15], "end": [11, 17], "fname": "Integration.fst"}, {"beg": [682, 18], "end": [682, 24], "fname": "Prims.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "198", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type nat got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Prims.fst:682.19-682.25\n", "number": 19, "ranges": [{"beg": [11, 15], "end": [11, 17], "fname": "Integration.fst"}, {"beg": [682, 18], "end": [682, 24], "fname": "Prims.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "200", "response": [], "status": "success"}
 {"kind": "response", "query-id": "204", "response": [], "status": "success"}
-{"kind": "response", "query-id": "205", "response": [{"level": "error", "message": "- Assertion failed\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Integration.fst(13,15-13,23)\n", "number": 19, "ranges": [{"beg": [13, 8], "end": [13, 14], "fname": "Integration.fst"}, {"beg": [13, 15], "end": [13, 23], "fname": "Integration.fst"}]}], "status": "failure"}
+{"kind": "response", "query-id": "205", "response": [{"level": "error", "message": "- Assertion failed\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Integration.fst:13.16-13.24\n", "number": 19, "ranges": [{"beg": [13, 8], "end": [13, 14], "fname": "Integration.fst"}, {"beg": [13, 15], "end": [13, 23], "fname": "Integration.fst"}]}], "status": "failure"}
 {"kind": "response", "query-id": "211", "response": [], "status": "success"}
 {"kind": "response", "query-id": "213", "response": [], "status": "success"}
 {"kind": "response", "query-id": "214", "response": [], "status": "success"}
diff --git a/tests/ide/emacs/Number.interface-violation-and-fix.ideout.expected b/tests/ide/emacs/Number.interface-violation-and-fix.ideout.expected
index 90d502d879c..a0d51c0058c 100644
--- a/tests/ide/emacs/Number.interface-violation-and-fix.ideout.expected
+++ b/tests/ide/emacs/Number.interface-violation-and-fix.ideout.expected
@@ -1,7 +1,7 @@
 {"kind": "protocol-info", "rest": "[...]"}
 {"kind": "response", "query-id": "1", "response": null, "status": "success"}
 {"kind": "response", "query-id": "2", "response": [], "status": "success"}
-{"kind": "response", "query-id": "3", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: int{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Number.fsti(18,14-18,19)\n", "number": 19, "ranges": [{"beg": [3, 8], "end": [3, 10], "fname": "Number.fst"}, {"beg": [18, 14], "end": [18, 19], "fname": "Number.fsti"}]}], "status": "failure"}
+{"kind": "response", "query-id": "3", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: int{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Number.fsti:18.15-18.20\n", "number": 19, "ranges": [{"beg": [3, 8], "end": [3, 10], "fname": "Number.fst"}, {"beg": [18, 14], "end": [18, 19], "fname": "Number.fsti"}]}], "status": "failure"}
 {"kind": "response", "query-id": "4", "response": null, "status": "success"}
 {"kind": "response", "query-id": "5", "response": null, "status": "success"}
 {"kind": "response", "query-id": "6", "response": [], "status": "success"}
diff --git a/tests/ide/emacs/Number.interface-violation.ideout.expected b/tests/ide/emacs/Number.interface-violation.ideout.expected
index 97da22ae131..1420b8bc84c 100644
--- a/tests/ide/emacs/Number.interface-violation.ideout.expected
+++ b/tests/ide/emacs/Number.interface-violation.ideout.expected
@@ -1,4 +1,4 @@
 {"kind": "protocol-info", "rest": "[...]"}
 {"kind": "response", "query-id": "1", "response": null, "status": "success"}
 {"kind": "response", "query-id": "2", "response": [], "status": "success"}
-{"kind": "response", "query-id": "3", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: int{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Number.fsti(18,14-18,19)\n", "number": 19, "ranges": [{"beg": [3, 8], "end": [3, 10], "fname": "Number.fst"}, {"beg": [18, 14], "end": [18, 19], "fname": "Number.fsti"}]}], "status": "failure"}
+{"kind": "response", "query-id": "3", "response": [{"level": "error", "message": "- Subtyping check failed\n- Expected type a: int{a > 0} got type int\n- The SMT solver could not prove the query. Use --query_stats for more details.\n- See also Number.fsti:18.15-18.20\n", "number": 19, "ranges": [{"beg": [3, 8], "end": [3, 10], "fname": "Number.fst"}, {"beg": [18, 14], "end": [18, 19], "fname": "Number.fsti"}]}], "status": "failure"}
diff --git a/tests/ide/emacs/Search.cons-snoc.ideout.expected b/tests/ide/emacs/Search.cons-snoc.ideout.expected
index cfd60ce3249..21fc5196481 100644
--- a/tests/ide/emacs/Search.cons-snoc.ideout.expected
+++ b/tests/ide/emacs/Search.cons-snoc.ideout.expected
@@ -1,3 +1,3 @@
 {"kind": "protocol-info", "rest": "[...]"}
 {"kind": "response", "query-id": "1", "response": [], "status": "success"}
-{"contents": "* Error 147 at Search.fst(1,0-1,0):\n  - Effect template FStar.Pervasives.STATE_h should be applied to arguments for its binders ((heap: Type)) before it can be used at an effect position\n\n", "kind": "message", "level": "error", "query-id": "2"}
+{"contents": "* Error 147 at Search.fst:1.0-1.0:\n  - Effect template FStar.Pervasives.STATE_h should be applied to arguments for its binders ((heap: Type)) before it can be used at an effect position\n\n", "kind": "message", "level": "error", "query-id": "2"}
diff --git a/tests/ide/emacs/Tutorial.segment.ideout.expected b/tests/ide/emacs/Tutorial.segment.ideout.expected
index eef6cb14569..27782de0c6b 100644
--- a/tests/ide/emacs/Tutorial.segment.ideout.expected
+++ b/tests/ide/emacs/Tutorial.segment.ideout.expected
@@ -1,2 +1,2 @@
 {"kind": "protocol-info", "rest": "[...]"}
-{"kind": "response", "query-id": "1", "response": {"decls": [{"def_range": {"beg": [1, 0], "end": [1, 15], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [2, 0], "end": [2, 13], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [3, 0], "end": [3, 14], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [6, 0], "end": [6, 22], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [9, 0], "end": [12, 16], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [15, 0], "end": [17, 20], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [20, 0], "end": [20, 47], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [21, 0], "end": [21, 73], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [23, 0], "end": [23, 55], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [24, 0], "end": [24, 93], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [27, 0], "end": [27, 29], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [28, 0], "end": [28, 27], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [29, 0], "end": [29, 29], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [32, 0], "end": [32, 36], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [33, 0], "end": [37, 20], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [41, 0], "end": [41, 21], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [42, 0], "end": [42, 39], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [43, 0], "end": [44, 49], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [47, 7], "end": [47, 55], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [54, 0], "end": [59, 28], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [61, 0], "end": [61, 48], "fname": "Tutorial.fst"}}]}, "status": "success"}
+{"kind": "response", "query-id": "1", "response": {"decls": [{"def_range": {"beg": [1, 1], "end": [1, 16], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [2, 0], "end": [2, 13], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [3, 0], "end": [3, 14], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [6, 0], "end": [6, 22], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [9, 0], "end": [12, 16], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [15, 0], "end": [17, 20], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [20, 0], "end": [20, 47], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [21, 0], "end": [21, 73], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [23, 0], "end": [23, 55], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [24, 0], "end": [24, 93], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [27, 0], "end": [27, 29], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [28, 0], "end": [28, 27], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [29, 0], "end": [29, 29], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [32, 0], "end": [32, 36], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [33, 0], "end": [37, 20], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [41, 0], "end": [41, 21], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [42, 0], "end": [42, 39], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [43, 0], "end": [44, 49], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [47, 7], "end": [47, 55], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [54, 0], "end": [59, 28], "fname": "Tutorial.fst"}}, {"def_range": {"beg": [61, 0], "end": [61, 48], "fname": "Tutorial.fst"}}]}, "status": "success"}
diff --git a/tests/ide/lsp/nonexisting_dependency.ideout.expected b/tests/ide/lsp/nonexisting_dependency.ideout.expected
index 2b056cffbef..300e2fcc617 100644
--- a/tests/ide/lsp/nonexisting_dependency.ideout.expected
+++ b/tests/ide/lsp/nonexisting_dependency.ideout.expected
@@ -1,10 +1,10 @@
-* Warning 285 at FStar.Const.fst(17,20-17,26):
+* Warning 285 at FStar.Const.fst:17.21-17.27:
   - No modules in namespace FStar.Compiler.Effect and no file with that name either
 
-* Warning 285 at FStar.Const.fst(17,56-17,60):
+* Warning 285 at FStar.Const.fst:17.57-17.61:
   - module not found in search path: fstar.compiler.list
 
-* Warning 285 at FStar.Const.fst(66,11-66,17):
+* Warning 285 at FStar.Const.fst:66.12-66.18:
   - No modules in namespace FStar.BigInt and no file with that name either
 
 Content-Length: 250
diff --git a/tests/micro-benchmarks/MatchRest.fst.output.expected b/tests/micro-benchmarks/MatchRest.fst.output.expected
index 80c41fa0808..b2547ed82a2 100644
--- a/tests/micro-benchmarks/MatchRest.fst.output.expected
+++ b/tests/micro-benchmarks/MatchRest.fst.output.expected
@@ -1,4 +1,4 @@
-* Info at MatchRest.fst(19,4-19,6):
+* Info at MatchRest.fst:19.5-19.7:
   - Expected failure:
   - Unexpected pattern.
   - Using `..` is only allowed as argument to a data constructor, e.g. `C ..`.
diff --git a/tests/micro-benchmarks/Typos.fst.output.expected b/tests/micro-benchmarks/Typos.fst.output.expected
index ffca35a0fff..bcf4c1231c4 100644
--- a/tests/micro-benchmarks/Typos.fst.output.expected
+++ b/tests/micro-benchmarks/Typos.fst.output.expected
@@ -1,19 +1,19 @@
-* Info at Typos.fst(6,8-6,13):
+* Info at Typos.fst:6.9-6.14:
   - Expected failure:
   - Module name Proms could not be resolved.
   - Hint: Did you mean Prims?
 
-* Info at Typos.fst(9,14-9,20):
+* Info at Typos.fst:9.15-9.21:
   - Expected failure:
   - Identifier strong not found in module Prims
   - Hint: Did you mean string?
 
-* Info at Typos.fst(16,8-16,9):
+* Info at Typos.fst:16.9-16.10:
   - Expected failure:
   - Identifier not found: d
   - Hint: Did you mean a, b or c?
 
-* Info at Typos.fst(22,8-22,14):
+* Info at Typos.fst:22.9-22.15:
   - Expected failure:
   - Module name Foooo3 could not be resolved.
   - Hint: Did you mean Foooo1 or Foooo2?