diff --git a/buildtools/fslex/fslexast.fs b/buildtools/fslex/fslexast.fs
index b621ac2dcdd..6c9e790101c 100644
--- a/buildtools/fslex/fslexast.fs
+++ b/buildtools/fslex/fslexast.fs
@@ -123,7 +123,7 @@ let GetSpecificUnicodeChars() =
 
 let GetSingleCharAlphabet: Parser<Set<char>> = fun ctx ->
     if ctx.unicode
-    then Set.ofList [ yield! { char 0 .. char <| numLowUnicodeChars-1 }
+    then Set.ofList [ yield! seq { char 0 .. char <| numLowUnicodeChars-1 }
                       yield! GetSpecificUnicodeChars() ]
     else Set.ofList [ char 0 .. char 255 ]
 
diff --git a/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs b/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs
index 00b992a6f92..3258dbbb9a5 100644
--- a/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs
+++ b/src/Compiler/Checking/Expressions/CheckComputationExpressions.fs
@@ -861,7 +861,7 @@ let (|ExprAsUseBang|_|) expr =
         rhs = rhsExpr
         andBangs = andBangs
         body = innerComp
-        trivia = { LetOrUseBangKeyword = mBind }) -> ValueSome(spBind, isFromSource, pat, rhsExpr, andBangs, innerComp, mBind)
+        trivia = { LetOrUseKeyword = mBind }) -> ValueSome(spBind, isFromSource, pat, rhsExpr, andBangs, innerComp, mBind)
     | _ -> ValueNone
 
 [<return: Struct>]
@@ -875,7 +875,7 @@ let (|ExprAsLetBang|_|) expr =
         rhs = letRhsExpr
         andBangs = andBangBindings
         body = innerComp
-        trivia = { LetOrUseBangKeyword = mBind }) -> ValueSome(spBind, isFromSource, letPat, letRhsExpr, andBangBindings, innerComp, mBind)
+        trivia = { LetOrUseKeyword = mBind }) -> ValueSome(spBind, isFromSource, letPat, letRhsExpr, andBangBindings, innerComp, mBind)
     | _ -> ValueNone
 
 // "cexpr; cexpr" is treated as builder.Combine(cexpr1, cexpr1)
@@ -1393,7 +1393,7 @@ let rec TryTranslateComputationExpression
                             [],
                             setCondExpr,
                             mGuard,
-                            SynExprLetOrUseBangTrivia.Zero
+                            SynExprLetOrUseTrivia.Zero
                         )
 
                     let whileExpr =
@@ -1422,7 +1422,7 @@ let rec TryTranslateComputationExpression
                     [],
                     body,
                     mGuard,
-                    SynExprLetOrUseBangTrivia.Zero
+                    SynExprLetOrUseTrivia.Zero
                 )
 
             TryTranslateComputationExpression ceenv CompExprTranslationPass.Initial q varSpace rewrittenWhileExpr translatedCtxt
@@ -1637,7 +1637,7 @@ let rec TryTranslateComputationExpression
                                     [],
                                     innerComp2,
                                     m,
-                                    SynExprLetOrUseBangTrivia.Zero
+                                    SynExprLetOrUseTrivia.Zero
                                 ))
                                 translatedCtxt
                         )
@@ -2393,7 +2393,7 @@ and ConsumeCustomOpClauses
                                 [],
                                 contExpr,
                                 intoPat.Range,
-                                SynExprLetOrUseBangTrivia.Zero
+                                SynExprLetOrUseTrivia.Zero
                             )
                         else
                             SynExpr.ForEach(
@@ -2434,7 +2434,7 @@ and ConsumeCustomOpClauses
                     [],
                     compClausesExpr,
                     compClausesExpr.Range,
-                    SynExprLetOrUseBangTrivia.Zero
+                    SynExprLetOrUseTrivia.Zero
                 )
             else
                 SynExpr.ForEach(
@@ -2697,7 +2697,7 @@ and TranslateComputationExpression (ceenv: ComputationExpressionContext<'a>) fir
                         [],
                         bodyExpr,
                         m,
-                        SynExprLetOrUseBangTrivia.Zero
+                        SynExprLetOrUseTrivia.Zero
                     )
 
                 TranslateComputationExpression ceenv CompExprTranslationPass.Initial q varSpace letBangBind translatedCtxt
diff --git a/src/Compiler/Checking/Expressions/CheckExpressions.fs b/src/Compiler/Checking/Expressions/CheckExpressions.fs
index 5862b907e05..1d191d77fd7 100644
--- a/src/Compiler/Checking/Expressions/CheckExpressions.fs
+++ b/src/Compiler/Checking/Expressions/CheckExpressions.fs
@@ -6072,7 +6072,7 @@ and TcExprUndelayed (cenv: cenv) (overallTy: OverallTy) env tpenv (synExpr: SynE
     | SynExpr.DoBang (trivia = { DoBangKeyword = m })
     | SynExpr.MatchBang (trivia = { MatchBangKeyword = m })
     | SynExpr.WhileBang (range = m)
-    | SynExpr.LetOrUseBang (trivia = { LetOrUseBangKeyword = m }) ->
+    | SynExpr.LetOrUseBang (trivia = { LetOrUseKeyword = m }) ->
         error(Error(FSComp.SR.tcConstructRequiresComputationExpression(), m))
 
     | SynExpr.IndexFromEnd (rightExpr, m) ->
diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fs b/src/Compiler/SyntaxTree/ParseHelpers.fs
index 4aeffc3a056..64b525e1afd 100644
--- a/src/Compiler/SyntaxTree/ParseHelpers.fs
+++ b/src/Compiler/SyntaxTree/ParseHelpers.fs
@@ -1071,9 +1071,10 @@ let mkLetExpression
             // Create let! or use! expression
             let spBind = DebugPointAtBinding.Yes(unionRanges mKeyword rhs.Range)
 
-            let trivia: SynExprLetOrUseBangTrivia =
+            let trivia: SynExprLetOrUseTrivia =
                 {
-                    LetOrUseBangKeyword = mKeyword
+                    LetOrUseKeyword = mKeyword
+                    InKeyword = mIn
                     EqualsRange = mEquals
                 }
             // isFromSource is true for user-written code
@@ -1106,6 +1107,11 @@ let mkLetExpression
                 | SynBinding(trivia = trivia) :: _ -> trivia.LeadingKeyword.Range
                 | _ -> range0
 
+            let mEquals =
+                match decls with
+                | SynBinding(trivia = trivia) :: _ -> trivia.EqualsRange
+                | _ -> None
+
             SynExpr.LetOrUse(
                 isRec,
                 isUse, // Pass through the isUse flag from binding info
@@ -1115,6 +1121,7 @@ let mkLetExpression
                 {
                     LetOrUseKeyword = mLetOrUse
                     InKeyword = mIn'
+                    EqualsRange = mEquals
                 }
             )
         | None -> SynExpr.FromParseError(body, mWhole)
diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fs b/src/Compiler/SyntaxTree/SyntaxTree.fs
index 5e3542f6b69..acbb6d0a26e 100644
--- a/src/Compiler/SyntaxTree/SyntaxTree.fs
+++ b/src/Compiler/SyntaxTree/SyntaxTree.fs
@@ -729,7 +729,7 @@ type SynExpr =
         andBangs: SynExprAndBang list *
         body: SynExpr *
         range: range *
-        trivia: SynExprLetOrUseBangTrivia
+        trivia: SynExprLetOrUseTrivia
 
     | MatchBang of
         matchDebugPoint: DebugPointAtBinding *
diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fsi b/src/Compiler/SyntaxTree/SyntaxTree.fsi
index aa6f394d6c4..2dd3bb35aae 100644
--- a/src/Compiler/SyntaxTree/SyntaxTree.fsi
+++ b/src/Compiler/SyntaxTree/SyntaxTree.fsi
@@ -899,7 +899,7 @@ type SynExpr =
         andBangs: SynExprAndBang list *
         body: SynExpr *
         range: range *
-        trivia: SynExprLetOrUseBangTrivia
+        trivia: SynExprLetOrUseTrivia
 
     /// F# syntax: match! expr with pat1 -> expr | ... | patN -> exprN
     | MatchBang of
diff --git a/src/Compiler/SyntaxTree/SyntaxTrivia.fs b/src/Compiler/SyntaxTree/SyntaxTrivia.fs
index 56002949b5c..7befe5e4a01 100644
--- a/src/Compiler/SyntaxTree/SyntaxTrivia.fs
+++ b/src/Compiler/SyntaxTree/SyntaxTrivia.fs
@@ -94,24 +94,13 @@ type SynExprLetOrUseTrivia =
     {
         LetOrUseKeyword: range
         InKeyword: range option
+        EqualsRange: range option
     }
 
     static member Zero: SynExprLetOrUseTrivia =
         {
             InKeyword = None
             LetOrUseKeyword = range0
-        }
-
-[<NoEquality; NoComparison>]
-type SynExprLetOrUseBangTrivia =
-    {
-        LetOrUseBangKeyword: range
-        EqualsRange: range option
-    }
-
-    static member Zero: SynExprLetOrUseBangTrivia =
-        {
-            LetOrUseBangKeyword = range0
             EqualsRange = None
         }
 
diff --git a/src/Compiler/SyntaxTree/SyntaxTrivia.fsi b/src/Compiler/SyntaxTree/SyntaxTrivia.fsi
index 89d7124e5f1..9a0b8d6b363 100644
--- a/src/Compiler/SyntaxTree/SyntaxTrivia.fsi
+++ b/src/Compiler/SyntaxTree/SyntaxTrivia.fsi
@@ -132,21 +132,11 @@ type SynExprLetOrUseTrivia =
         LetOrUseKeyword: range
         /// The syntax range of the `in` keyword.
         InKeyword: range option
-    }
-
-    static member Zero: SynExprLetOrUseTrivia
 
-/// Represents additional information for SynExpr.LetOrUseBang
-[<NoEquality; NoComparison>]
-type SynExprLetOrUseBangTrivia =
-    {
-        /// The syntax range of the `let!` or `use!` keyword.
-        LetOrUseBangKeyword: range
-        /// The syntax range of the `=` token.
         EqualsRange: range option
     }
 
-    static member Zero: SynExprLetOrUseBangTrivia
+    static member Zero: SynExprLetOrUseTrivia
 
 /// Represents additional information for SynExpr.Match
 [<NoEquality; NoComparison>]
diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl
index 4f1bda7afd1..4275cefb8be 100644
--- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl
+++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.debug.bsl
@@ -7229,8 +7229,8 @@ FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Syntax.SynExpr get_
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Syntax.SynExpr rhs
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Syntax.SynPat get_pat()
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Syntax.SynPat pat
-FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia get_trivia()
-FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia trivia
+FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia get_trivia()
+FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia trivia
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Text.Range get_range()
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Text.Range range
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynExprAndBang] andBangs
@@ -7760,7 +7760,7 @@ FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewJoinIn(FSharp.
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLambda(Boolean, Boolean, FSharp.Compiler.Syntax.SynSimplePats, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Core.FSharpOption`1[System.Tuple`2[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynPat],FSharp.Compiler.Syntax.SynExpr]], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLazy(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLetOrUse(Boolean, Boolean, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynBinding], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia)
-FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLetOrUseBang(FSharp.Compiler.Syntax.DebugPointAtBinding, Boolean, Boolean, FSharp.Compiler.Syntax.SynPat, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynExprAndBang], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia)
+FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLetOrUseBang(FSharp.Compiler.Syntax.DebugPointAtBinding, Boolean, Boolean, FSharp.Compiler.Syntax.SynPat, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynExprAndBang], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLibraryOnlyILAssembly(System.Object, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynType], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynExpr], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynType], FSharp.Compiler.Text.Range)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLibraryOnlyStaticOptimization(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynStaticOptimizationConstraint], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLibraryOnlyUnionCaseFieldGet(FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.Ident], Int32, FSharp.Compiler.Text.Range)
@@ -10337,22 +10337,16 @@ FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: Microsoft.FSharp.Core.FSharpOp
 FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_ArrowRange()
 FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: System.String ToString()
 FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: Void .ctor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia Zero
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia get_Zero()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range LetOrUseBangKeyword
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range get_LetOrUseBangKeyword()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] EqualsRange
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_EqualsRange()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: System.String ToString()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia Zero
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia get_Zero()
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range LetOrUseKeyword
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range get_LetOrUseKeyword()
+FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] EqualsRange
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] InKeyword
+FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_EqualsRange()
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_InKeyword()
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: System.String ToString()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
+FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
 FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range MatchBangKeyword
 FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range WithKeyword
 FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range get_MatchBangKeyword()
@@ -10837,22 +10831,18 @@ FSharp.Compiler.SyntaxTrivia.SynValSigTrivia: Microsoft.FSharp.Core.FSharpOption
 FSharp.Compiler.SyntaxTrivia.SynValSigTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_WithKeyword()
 FSharp.Compiler.SyntaxTrivia.SynValSigTrivia: System.String ToString()
 FSharp.Compiler.SyntaxTrivia.SynValSigTrivia: Void .ctor(FSharp.Compiler.SyntaxTrivia.SynLeadingKeyword, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Nowarn: FSharp.Compiler.Text.Range Item2
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Nowarn: FSharp.Compiler.Text.Range get_Item2()
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Nowarn: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_warnNumbers()
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Nowarn: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] warnNumbers
+FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Nowarn: FSharp.Compiler.Text.Range Item
+FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Nowarn: FSharp.Compiler.Text.Range get_Item()
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Tags: Int32 Nowarn
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Tags: Int32 Warnon
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Warnon: FSharp.Compiler.Text.Range Item2
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Warnon: FSharp.Compiler.Text.Range get_Item2()
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Warnon: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] get_warnNumbers()
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Warnon: Microsoft.FSharp.Collections.FSharpList`1[System.Int32] warnNumbers
+FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Warnon: FSharp.Compiler.Text.Range Item
+FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Warnon: FSharp.Compiler.Text.Range get_Item()
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: Boolean IsNowarn
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: Boolean IsWarnon
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: Boolean get_IsNowarn()
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: Boolean get_IsWarnon()
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia NewNowarn(Microsoft.FSharp.Collections.FSharpList`1[System.Int32], FSharp.Compiler.Text.Range)
-FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia NewWarnon(Microsoft.FSharp.Collections.FSharpList`1[System.Int32], FSharp.Compiler.Text.Range)
+FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia NewNowarn(FSharp.Compiler.Text.Range)
+FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia NewWarnon(FSharp.Compiler.Text.Range)
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Nowarn
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Tags
 FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia: FSharp.Compiler.SyntaxTrivia.WarnDirectiveTrivia+Warnon
diff --git a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl
index 703e5029e32..4275cefb8be 100644
--- a/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl
+++ b/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.SurfaceArea.netstandard20.release.bsl
@@ -7229,8 +7229,8 @@ FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Syntax.SynExpr get_
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Syntax.SynExpr rhs
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Syntax.SynPat get_pat()
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Syntax.SynPat pat
-FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia get_trivia()
-FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia trivia
+FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia get_trivia()
+FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia trivia
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Text.Range get_range()
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: FSharp.Compiler.Text.Range range
 FSharp.Compiler.Syntax.SynExpr+LetOrUseBang: Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynExprAndBang] andBangs
@@ -7760,7 +7760,7 @@ FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewJoinIn(FSharp.
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLambda(Boolean, Boolean, FSharp.Compiler.Syntax.SynSimplePats, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Core.FSharpOption`1[System.Tuple`2[Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynPat],FSharp.Compiler.Syntax.SynExpr]], FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLazy(FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLetOrUse(Boolean, Boolean, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynBinding], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia)
-FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLetOrUseBang(FSharp.Compiler.Syntax.DebugPointAtBinding, Boolean, Boolean, FSharp.Compiler.Syntax.SynPat, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynExprAndBang], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia)
+FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLetOrUseBang(FSharp.Compiler.Syntax.DebugPointAtBinding, Boolean, Boolean, FSharp.Compiler.Syntax.SynPat, FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynExprAndBang], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range, FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLibraryOnlyILAssembly(System.Object, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynType], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynExpr], Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynType], FSharp.Compiler.Text.Range)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLibraryOnlyStaticOptimization(Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.SynStaticOptimizationConstraint], FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Syntax.SynExpr, FSharp.Compiler.Text.Range)
 FSharp.Compiler.Syntax.SynExpr: FSharp.Compiler.Syntax.SynExpr NewLibraryOnlyUnionCaseFieldGet(FSharp.Compiler.Syntax.SynExpr, Microsoft.FSharp.Collections.FSharpList`1[FSharp.Compiler.Syntax.Ident], Int32, FSharp.Compiler.Text.Range)
@@ -10337,22 +10337,16 @@ FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: Microsoft.FSharp.Core.FSharpOp
 FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_ArrowRange()
 FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: System.String ToString()
 FSharp.Compiler.SyntaxTrivia.SynExprLambdaTrivia: Void .ctor(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia Zero
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia get_Zero()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range LetOrUseBangKeyword
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: FSharp.Compiler.Text.Range get_LetOrUseBangKeyword()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] EqualsRange
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_EqualsRange()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: System.String ToString()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseBangTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia Zero
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia get_Zero()
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range LetOrUseKeyword
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: FSharp.Compiler.Text.Range get_LetOrUseKeyword()
+FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] EqualsRange
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] InKeyword
+FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_EqualsRange()
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range] get_InKeyword()
 FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: System.String ToString()
-FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
+FSharp.Compiler.SyntaxTrivia.SynExprLetOrUseTrivia: Void .ctor(FSharp.Compiler.Text.Range, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Text.Range])
 FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range MatchBangKeyword
 FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range WithKeyword
 FSharp.Compiler.SyntaxTrivia.SynExprMatchBangTrivia: FSharp.Compiler.Text.Range get_MatchBangKeyword()
diff --git a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
index 3213618de10..9d1c6939e3e 100644
--- a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
@@ -46,10 +46,11 @@ ImplFile
                            EqualsRange = Some (3,21--3,22) })],
                      Const (Unit, (4,4--4,6)), (3,4--4,6),
                      { LetOrUseKeyword = (3,4--3,7)
-                       InKeyword = None }), (2,11--2,16), NoneAtLet,
-                  { LeadingKeyword = Let (2,0--2,3)
-                    InlineKeyword = Some (2,4--2,10)
-                    EqualsRange = Some (2,17--2,18) })], (2,0--4,6))],
+                       InKeyword = None
+                       EqualsRange = Some (3,21--3,22) }), (2,11--2,16),
+                  NoneAtLet, { LeadingKeyword = Let (2,0--2,3)
+                               InlineKeyword = Some (2,4--2,10)
+                               EqualsRange = Some (2,17--2,18) })], (2,0--4,6))],
           PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })],
       (true, true), { ConditionalDirectives = []
                       WarnDirectives = []
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
index 9921095320e..c54522f64b2 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
@@ -21,8 +21,10 @@ ImplFile
                                            EqualsRange = Some (3,10--3,11) })],
                     Const (Unit, (4,4--4,6)), (3,4--4,6),
                     { LetOrUseKeyword = (3,4--3,7)
-                      InKeyword = None }), (2,0--4,6)), (2,0--4,6))],
-          PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })],
-      (true, true), { ConditionalDirectives = []
-                      WarnDirectives = []
-                      CodeComments = [] }, set []))
+                      InKeyword = None
+                      EqualsRange = Some (3,10--3,11) }), (2,0--4,6)),
+              (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0),
+          { LeadingKeyword = None })], (true, true),
+      { ConditionalDirectives = []
+        WarnDirectives = []
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
index 770bfd5f4d5..ce9d335891d 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
@@ -32,8 +32,10 @@ ImplFile
                           EqualsRange = Some (3,15--3,16) })],
                     Const (Unit, (4,4--4,6)), (3,4--4,6),
                     { LetOrUseKeyword = (3,4--3,7)
-                      InKeyword = None }), (2,0--4,6)), (2,0--4,6))],
-          PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })],
-      (true, true), { ConditionalDirectives = []
-                      WarnDirectives = []
-                      CodeComments = [] }, set []))
+                      InKeyword = None
+                      EqualsRange = Some (3,15--3,16) }), (2,0--4,6)),
+              (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0),
+          { LeadingKeyword = None })], (true, true),
+      { ConditionalDirectives = []
+        WarnDirectives = []
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
index 747fdcbc1e2..2e096ce46f6 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
@@ -36,7 +36,8 @@ ImplFile
                                       EqualsRange = Some (3,12--3,13) })],
                      Const (Unit, (4,4--4,6)), (3,4--4,6),
                      { LetOrUseKeyword = (3,4--3,7)
-                       InKeyword = None }), (2,4--2,5), NoneAtLet,
+                       InKeyword = None
+                       EqualsRange = Some (3,12--3,13) }), (2,4--2,5), NoneAtLet,
                   { LeadingKeyword = Let (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange = Some (2,6--2,7) })], (2,0--4,6))],
diff --git a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
index a9f281321fa..bdee1f621ed 100644
--- a/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/ComputationExpression/MultipleSynExprAndBangHaveRangeThatStartsAtAndAndEndsAfterExpression.fs.bsl
@@ -41,7 +41,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident bar, (6,4--6,14),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (3,4--6,14),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,13--3,14) }), (2,6--7,1)),
                  (2,0--7,1)), (2,0--7,1))], PreXmlDocEmpty, [], None, (2,0--7,1),
           { LeadingKeyword = None })], (true, true),
diff --git a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
index 031ace760eb..58d455dacb1 100644
--- a/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/ComputationExpression/SynExprAndBangRangeStartsAtAndAndEndsAfterExpression.fs.bsl
@@ -31,7 +31,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident bar, (7,4--7,14),
                           { YieldOrReturnKeyword = (7,4--7,10) }), (3,4--7,14),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,13--3,14) }), (2,6--8,1)),
                  (2,0--8,1)), (2,0--8,1))], PreXmlDocEmpty, [], None, (2,0--8,1),
           { LeadingKeyword = None })], (true, true),
diff --git a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 51a31c623dd..fc36bd59dfc 100644
--- a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -55,9 +55,11 @@ ImplFile
                                  (5,6--5,7)), Ident x, (5,4--5,7)), Ident y,
                            (5,4--5,9)), (4,4--5,9),
                         { LetOrUseKeyword = (4,4--4,7)
-                          InKeyword = Some (4,14--4,16) }), (3,4--5,9),
+                          InKeyword = Some (4,14--4,16)
+                          EqualsRange = Some (4,10--4,11) }), (3,4--5,9),
                      { LetOrUseKeyword = (3,4--3,7)
-                       InKeyword = Some (3,14--3,16) }), (2,4--2,8), NoneAtLet,
+                       InKeyword = Some (3,14--3,16)
+                       EqualsRange = Some (3,10--3,11) }), (2,4--2,8), NoneAtLet,
                   { LeadingKeyword = Let (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange = Some (2,9--2,10) })], (2,0--5,9))],
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
index 19bef59c8a3..05609fbca45 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseBangContainsTheRangeOfTheEqualsSign.fs.bsl
@@ -27,7 +27,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Const (Unit, (5,11--5,13)), (5,4--5,13),
                           { YieldOrReturnKeyword = (5,4--5,10) }), (3,4--5,13),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,11--3,12) }), (2,5--6,1)),
                  (2,0--6,1)), (2,0--6,1))], PreXmlDocEmpty, [], None, (2,0--6,1),
           { LeadingKeyword = None })], (true, true),
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 47612e2ac1c..37bc9c3b31c 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -20,7 +20,8 @@ ImplFile
                        EqualsRange = Some (2,6--2,7) })],
                  Const (Unit, (2,13--2,15)), (2,0--2,15),
                  { LetOrUseKeyword = (2,0--2,3)
-                   InKeyword = Some (2,10--2,12) }), (2,0--2,15))],
+                   InKeyword = Some (2,10--2,12)
+                   EqualsRange = Some (2,6--2,7) }), (2,0--2,15))],
           PreXmlDocEmpty, [], None, (2,0--2,15), { LeadingKeyword = None })],
       (true, true), { ConditionalDirectives = []
                       WarnDirectives = []
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
index a7ba9540a40..05a52bec5e5 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -22,7 +22,8 @@ ImplFile
                                           EqualsRange = Some (3,6--3,7) })],
                     Const (Unit, (4,0--4,2)), (3,0--4,2),
                     { LetOrUseKeyword = (3,0--3,3)
-                      InKeyword = None }), (2,0--4,2)), (2,0--4,2))],
+                      InKeyword = None
+                      EqualsRange = Some (3,6--3,7) }), (2,0--4,2)), (2,0--4,2))],
           PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })],
       (true, true), { ConditionalDirectives = []
                       WarnDirectives = []
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
index 691c7762f37..583e33b78ec 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -41,7 +41,8 @@ ImplFile
                              ([e1; Value], [(4,10--4,11)], [None; None]), None,
                            (4,8--4,16))], [(4,6--4,7)], (4,0--4,16)),
                     (3,0--4,16), { LetOrUseKeyword = (3,0--3,3)
-                                   InKeyword = None }), (2,0--4,16)),
+                                   InKeyword = None
+                                   EqualsRange = Some (3,7--3,8) }), (2,0--4,16)),
               (2,0--4,16))], PreXmlDocEmpty, [], None, (2,0--5,0),
           { LeadingKeyword = None })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
index b2ac0ca44e8..692b5495fcb 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
@@ -36,8 +36,10 @@ ImplFile
                                            EqualsRange = Some (4,10--4,11) })],
                     Const (Unit, (5,4--5,6)), (3,4--5,6),
                     { LetOrUseKeyword = (3,4--3,11)
-                      InKeyword = Some (4,15--4,17) }), (2,0--5,6)), (2,0--5,6))],
-          PreXmlDocEmpty, [], None, (2,0--6,0), { LeadingKeyword = None })],
-      (true, true), { ConditionalDirectives = []
-                      WarnDirectives = []
-                      CodeComments = [] }, set []))
+                      InKeyword = Some (4,15--4,17)
+                      EqualsRange = Some (3,14--3,15) }), (2,0--5,6)),
+              (2,0--5,6))], PreXmlDocEmpty, [], None, (2,0--6,0),
+          { LeadingKeyword = None })], (true, true),
+      { ConditionalDirectives = []
+        WarnDirectives = []
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl
index 319880a8b0a..f3992cf7040 100644
--- a/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try with - Missing expr 04.fs.bsl	
@@ -20,12 +20,13 @@ ImplFile
                           EqualsRange = Some (5,6--5,7) })],
                     ArbitraryAfterError ("seqExpr", (5,10--5,10)), (5,0--5,10),
                     { LetOrUseKeyword = (5,0--5,3)
-                      InKeyword = None }), [], (3,0--5,10), Yes (3,0--3,3),
-                 Yes (5,10--5,10), { TryKeyword = (3,0--3,3)
-                                     TryToWithRange = (3,0--5,10)
-                                     WithKeyword = (5,10--5,10)
-                                     WithToEndRange = (3,0--5,10) }),
-              (3,0--5,10))],
+                      InKeyword = None
+                      EqualsRange = Some (5,6--5,7) }), [], (3,0--5,10),
+                 Yes (3,0--3,3), Yes (5,10--5,10),
+                 { TryKeyword = (3,0--3,3)
+                   TryToWithRange = (3,0--5,10)
+                   WithKeyword = (5,10--5,10)
+                   WithToEndRange = (3,0--5,10) }), (3,0--5,10))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--5,10), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
index 913dfadb878..1774b119f59 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
@@ -24,8 +24,10 @@ ImplFile
                           EqualsRange = Some (3,10--3,11) })],
                     Const (Unit, (4,4--4,6)), (3,4--4,6),
                     { LetOrUseKeyword = (3,4--3,7)
-                      InKeyword = None }), (2,0--4,6)), (2,0--4,6))],
-          PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })],
-      (true, true), { ConditionalDirectives = []
-                      WarnDirectives = []
-                      CodeComments = [] }, set []))
+                      InKeyword = None
+                      EqualsRange = Some (3,10--3,11) }), (2,0--4,6)),
+              (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0),
+          { LeadingKeyword = None })], (true, true),
+      { ConditionalDirectives = []
+        WarnDirectives = []
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
index eac3e1cf38c..aececc8348e 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
@@ -24,8 +24,10 @@ ImplFile
                           EqualsRange = Some (3,14--3,15) })],
                     Const (Unit, (4,4--4,6)), (3,4--4,6),
                     { LetOrUseKeyword = (3,4--3,11)
-                      InKeyword = None }), (2,0--4,6)), (2,0--4,6))],
-          PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })],
-      (true, true), { ConditionalDirectives = []
-                      WarnDirectives = []
-                      CodeComments = [] }, set []))
+                      InKeyword = None
+                      EqualsRange = Some (3,14--3,15) }), (2,0--4,6)),
+              (2,0--4,6))], PreXmlDocEmpty, [], None, (2,0--5,0),
+          { LeadingKeyword = None })], (true, true),
+      { ConditionalDirectives = []
+        WarnDirectives = []
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
index 25fb2192c73..19f2154a6c9 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
@@ -26,7 +26,8 @@ ImplFile
                     App
                       (NonAtomic, false, Ident Some, Ident content, (4,4--4,16)),
                     (3,4--4,16), { LetOrUseKeyword = (3,4--3,7)
-                                   InKeyword = None }),
+                                   InKeyword = None
+                                   EqualsRange = Some (3,16--3,17) }),
                  [SynMatchClause
                     (Named (SynIdent (ex, None), false, None, (6,2--6,4)), None,
                      Sequential
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
index 547027c53ab..e5bbe56cba7 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
@@ -26,7 +26,8 @@ ImplFile
                     App
                       (NonAtomic, false, Ident Some, Ident content, (4,4--4,16)),
                     (3,4--4,16), { LetOrUseKeyword = (3,4--3,7)
-                                   InKeyword = None }),
+                                   InKeyword = None
+                                   EqualsRange = Some (3,16--3,17) }),
                  [SynMatchClause
                     (Named (SynIdent (ex, None), false, None, (5,5--5,7)), None,
                      Sequential
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
index 11f88dadedb..21f8e8cdb6b 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
@@ -26,7 +26,8 @@ ImplFile
                     App
                       (NonAtomic, false, Ident Some, Ident content, (4,4--4,16)),
                     (3,4--4,16), { LetOrUseKeyword = (3,4--3,7)
-                                   InKeyword = None }),
+                                   InKeyword = None
+                                   EqualsRange = Some (3,16--3,17) }),
                  [SynMatchClause
                     (Named (SynIdent (ex, None), false, None, (6,2--6,4)), None,
                      Const (Unit, (7,4--7,6)), (6,2--7,6), Yes,
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl
index 12785905c05..d4c056f191b 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 05.fs.bsl	
@@ -31,7 +31,8 @@ ImplFile
                              EqualsRange = None })],
                        ArbitraryAfterError ("seqExpr", (4,10--4,10)),
                        (4,4--4,10), { LetOrUseKeyword = (4,4--4,7)
-                                      InKeyword = None }), (4,4--4,10)),
+                                      InKeyword = None
+                                      EqualsRange = None }), (4,4--4,10)),
                  (3,0--4,10)), (3,0--4,10))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--4,10), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl
index a6e663f076a..229f126fa39 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 06.fs.bsl	
@@ -28,7 +28,9 @@ ImplFile
                           EqualsRange = Some (4,11--4,12) })],
                     Const (Unit, (6,4--6,6)), (4,4--6,6),
                     { LetOrUseKeyword = (4,4--4,7)
-                      InKeyword = None }), (3,0--6,6)), (3,0--6,6))],
+                      InKeyword = None
+                      EqualsRange = Some (4,11--4,12) }), (3,0--6,6)),
+              (3,0--6,6))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl
index bdac43a6b34..bf0847e0ea0 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 09.fs.bsl	
@@ -26,7 +26,8 @@ ImplFile
                           InlineKeyword = None
                           EqualsRange = None })], Const (Unit, (6,4--6,6)),
                     (4,4--6,6), { LetOrUseKeyword = (4,4--4,7)
-                                  InKeyword = None }), (3,0--6,6)), (3,0--6,6))],
+                                  InKeyword = None
+                                  EqualsRange = None }), (3,0--6,6)), (3,0--6,6))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl
index b18b97bfe76..65b1b0d7a95 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 10.fs.bsl	
@@ -26,7 +26,9 @@ ImplFile
                           EqualsRange = Some (4,13--4,14) })],
                     Const (Unit, (6,4--6,6)), (4,4--6,6),
                     { LetOrUseKeyword = (4,4--4,7)
-                      InKeyword = None }), (3,0--6,6)), (3,0--6,6))],
+                      InKeyword = None
+                      EqualsRange = Some (4,13--4,14) }), (3,0--6,6)),
+              (3,0--6,6))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl
index be2e2e830c2..4980b86a481 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 11.fs.bsl	
@@ -32,7 +32,9 @@ ImplFile
                           EqualsRange = Some (4,15--4,16) })],
                     Const (Unit, (6,4--6,6)), (4,4--6,6),
                     { LetOrUseKeyword = (4,4--4,7)
-                      InKeyword = None }), (3,0--6,6)), (3,0--6,6))],
+                      InKeyword = None
+                      EqualsRange = Some (4,15--4,16) }), (3,0--6,6)),
+              (3,0--6,6))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl
index 9b2df1c8190..b9200e91fd0 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 12.fs.bsl	
@@ -40,7 +40,9 @@ ImplFile
                           EqualsRange = Some (4,18--4,19) })],
                     Const (Unit, (6,4--6,6)), (4,4--6,6),
                     { LetOrUseKeyword = (4,4--4,7)
-                      InKeyword = None }), (3,0--6,6)), (3,0--6,6))],
+                      InKeyword = None
+                      EqualsRange = Some (4,18--4,19) }), (3,0--6,6)),
+              (3,0--6,6))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--6,6), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl
index 5d675200d7c..d8e5ea12eab 100644
--- a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl
@@ -32,11 +32,13 @@ ImplFile
                            InlineKeyword = None
                            EqualsRange = Some (2,10--2,11) })], Ident b,
                      (2,4--5,5), { LetOrUseKeyword = (2,4--2,7)
-                                   InKeyword = None }), (1,4--1,5), NoneAtLet,
-                  { LeadingKeyword = Let (1,0--1,3)
-                    InlineKeyword = None
-                    EqualsRange = Some (1,6--1,7) })], (1,0--5,5))],
-          PreXmlDocEmpty, [], None, (1,0--5,5), { LeadingKeyword = None })],
-      (true, true), { ConditionalDirectives = []
-                      WarnDirectives = []
-                      CodeComments = [] }, set []))
+                                   InKeyword = None
+                                   EqualsRange = Some (2,10--2,11) }),
+                  (1,4--1,5), NoneAtLet, { LeadingKeyword = Let (1,0--1,3)
+                                           InlineKeyword = None
+                                           EqualsRange = Some (1,6--1,7) })],
+              (1,0--5,5))], PreXmlDocEmpty, [], None, (1,0--5,5),
+          { LeadingKeyword = None })], (true, true),
+      { ConditionalDirectives = []
+        WarnDirectives = []
+        CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 01.fs.bsl
index 1aa552d5f05..e0c44d14f8a 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 01.fs.bsl	
@@ -26,7 +26,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident res, (5,4--5,14),
                           { YieldOrReturnKeyword = (5,4--5,10) }), (4,4--5,14),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,18--4,19) }), (3,6--6,1)),
                  (3,0--6,1)), (3,0--6,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 02.fs.bsl
index 6046708ca7f..a104e92410c 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 02.fs.bsl	
@@ -28,7 +28,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident res, (5,4--5,14),
                           { YieldOrReturnKeyword = (5,4--5,10) }), (4,4--5,14),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,20--4,21) }), (3,6--6,1)),
                  (3,0--6,1)), (3,0--6,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 03.fs.bsl
index c065ea59e32..e0f29e22664 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 03.fs.bsl	
@@ -113,11 +113,13 @@ ImplFile
                                       Ident c, (6,11--6,20)), (6,11--6,22)),
                                 Ident d, (6,11--6,24)), (6,4--6,24),
                              { YieldOrReturnKeyword = (6,4--6,10) }),
-                          (5,4--6,24), { LetOrUseBangKeyword = (5,4--5,8)
+                          (5,4--6,24), { LetOrUseKeyword = (5,4--5,8)
+                                         InKeyword = None
                                          EqualsRange = Some (5,26--5,27) }),
                        (4,4--6,24), { LetOrUseKeyword = (4,4--4,7)
-                                      InKeyword = None }), (3,6--7,1)),
-                 (3,0--7,1)), (3,0--7,1))],
+                                      InKeyword = None
+                                      EqualsRange = Some (4,25--4,26) }),
+                    (3,6--7,1)), (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--7,1), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 04.fs.bsl
index fc39d00e0a5..cd28aa03595 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 04.fs.bsl	
@@ -37,7 +37,8 @@ ImplFile
                                  EqualsRange = None })],
                            ArbitraryAfterError ("declExpr3", (5,15--5,16)),
                            (4,4--5,16), { LetOrUseKeyword = (4,4--4,7)
-                                          InKeyword = None }); Ident d],
+                                          InKeyword = None
+                                          EqualsRange = None }); Ident d],
                        [(5,15--5,16)], (4,4--5,18)), (3,6--5,47)), (3,0--5,47)),
               (3,0--5,47))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 05.fs.bsl
index 08008766b4d..d93e009f5d7 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 05.fs.bsl	
@@ -34,9 +34,11 @@ ImplFile
                              { YieldOrReturnKeyword = (3,23--3,29) }),
                           (3,21--3,33)), (3,15--3,33)), [],
                     ImplicitZero (3,33--3,33), (3,0--3,33),
-                    { LetOrUseBangKeyword = (3,0--3,4)
+                    { LetOrUseKeyword = (3,0--3,4)
+                      InKeyword = None
                       EqualsRange = Some (3,13--3,14) }), (2,0--3,33),
-                 { LetOrUseBangKeyword = (2,0--2,4)
+                 { LetOrUseKeyword = (2,0--2,4)
+                   InKeyword = None
                    EqualsRange = Some (2,11--2,12) }), (2,0--3,33))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--3,33), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 06.fs.bsl
index 591ef048599..77623805e3a 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 06.fs.bsl	
@@ -34,9 +34,11 @@ ImplFile
                              { YieldOrReturnKeyword = (3,23--3,29) }),
                           (3,21--3,33)), (3,15--3,33)), [],
                     ImplicitZero (3,33--3,33), (3,0--3,33),
-                    { LetOrUseBangKeyword = (3,0--3,4)
+                    { LetOrUseKeyword = (3,0--3,4)
+                      InKeyword = None
                       EqualsRange = Some (3,13--3,14) }), (2,0--3,33),
-                 { LetOrUseBangKeyword = (2,0--2,4)
+                 { LetOrUseKeyword = (2,0--2,4)
+                   InKeyword = None
                    EqualsRange = Some (2,11--2,12) }), (2,0--3,33))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--3,33), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 07.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 07.fs.bsl
index 9493eb7270f..ec976f9d78d 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 07.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 07.fs.bsl	
@@ -25,7 +25,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident name, (5,4--5,15),
                           { YieldOrReturnKeyword = (5,4--5,10) }), (3,4--5,15),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,35--3,36) }), (2,6--7,1)),
                  (2,0--7,1)), (2,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 08.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 08.fs.bsl
index 62bf5bc63db..df08719e64d 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 08.fs.bsl	
@@ -24,7 +24,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident name, (4,4--4,15),
                           { YieldOrReturnKeyword = (4,4--4,10) }), (3,4--4,15),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,33--3,34) }), (2,6--6,1)),
                  (2,0--6,1)), (2,0--6,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 09.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 09.fs.bsl
index 0516dc630a8..f60b9363710 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 09.fs.bsl	
@@ -24,7 +24,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident value, (4,4--4,16),
                           { YieldOrReturnKeyword = (4,4--4,10) }), (3,4--4,16),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,23--3,24) }), (2,6--5,1)),
                  (2,0--5,1)), (2,0--5,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 10.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 10.fs.bsl
index f3758aff371..43d9f3e2fe9 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 10.fs.bsl	
@@ -22,7 +22,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident value, (4,4--4,16),
                           { YieldOrReturnKeyword = (4,4--4,10) }), (3,4--4,16),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,21--3,22) }), (2,6--5,1)),
                  (2,0--5,1)), (2,0--5,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 11.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 11.fs.bsl
index 096e0effc20..10b908ae70f 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 11.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 11.fs.bsl	
@@ -30,7 +30,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident value, (4,4--4,16),
                           { YieldOrReturnKeyword = (4,4--4,10) }), (3,4--4,16),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,35--3,36) }), (2,6--5,1)),
                  (2,0--5,1)), (2,0--5,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 12.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 12.fs.bsl
index b274a8880f3..129c53c43f2 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 12.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 12.fs.bsl	
@@ -28,7 +28,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident value, (4,4--4,16),
                           { YieldOrReturnKeyword = (4,4--4,10) }), (3,4--4,16),
-                       { LetOrUseBangKeyword = (3,4--3,8)
+                       { LetOrUseKeyword = (3,4--3,8)
+                         InKeyword = None
                          EqualsRange = Some (3,33--3,34) }), (2,6--5,1)),
                  (2,0--5,1)), (2,0--5,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 14.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 14.fs.bsl
index c4ed5ee643f..93a922eddab 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 14.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 14.fs.bsl	
@@ -55,7 +55,8 @@ ImplFile
                                    (6,13--6,14)), Ident x, (6,11--6,14)),
                              Ident b, (6,11--6,16)), (6,4--6,16),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,16),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,19--4,20) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 15.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 15.fs.bsl
index 1a461ef4b3e..a199310f6a3 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 15.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 15.fs.bsl	
@@ -36,7 +36,8 @@ ImplFile
                                    (6,13--6,14)), Ident x, (6,11--6,14)),
                              Ident b, (6,11--6,16)), (6,4--6,16),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,16),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (5,26--5,27) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 17.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 17.fs.bsl
index 6f78c27dca1..25505e0b9e6 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 17.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 17.fs.bsl	
@@ -46,7 +46,8 @@ ImplFile
                           (5,32--5,40), { YieldOrReturnKeyword = (5,32--5,38) }),
                        (5,30--5,42)), (5,24--5,42)), [],
                  ImplicitZero (5,42--5,42), (5,0--5,42),
-                 { LetOrUseBangKeyword = (5,0--5,4)
+                 { LetOrUseKeyword = (5,0--5,4)
+                   InKeyword = None
                    EqualsRange = Some (5,22--5,23) }), (5,0--5,42))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--5,42), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 18.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 18.fs.bsl
index 8579d42db13..180faf48052 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 18.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 18.fs.bsl	
@@ -47,7 +47,8 @@ ImplFile
                           (5,30--5,38), { YieldOrReturnKeyword = (5,30--5,36) }),
                        (5,28--5,40)), (5,22--5,40)), [],
                  ImplicitZero (5,40--5,40), (5,0--5,40),
-                 { LetOrUseBangKeyword = (5,0--5,4)
+                 { LetOrUseKeyword = (5,0--5,4)
+                   InKeyword = None
                    EqualsRange = Some (5,20--5,21) }), (5,0--5,40))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--5,40), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 19.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 19.fs.bsl
index 4ccac506d64..ecd65b24301 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 19.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 19.fs.bsl	
@@ -57,11 +57,13 @@ ImplFile
                           YieldOrReturn
                             ((false, true), Ident x, (6,4--6,12),
                              { YieldOrReturnKeyword = (6,4--6,10) }),
-                          (5,4--6,12), { LetOrUseBangKeyword = (5,4--5,8)
+                          (5,4--6,12), { LetOrUseKeyword = (5,4--5,8)
+                                         InKeyword = None
                                          EqualsRange = Some (5,26--5,27) }),
                        (4,4--6,12), { LetOrUseKeyword = (4,4--4,7)
-                                      InKeyword = None }), (3,6--7,1)),
-                 (3,0--7,1)), (3,0--7,1))],
+                                      InKeyword = None
+                                      EqualsRange = Some (4,25--4,26) }),
+                    (3,6--7,1)), (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--7,1), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang 20.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang 20.fs.bsl
index e14813fde0c..c9d8cdb5267 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang 20.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang 20.fs.bsl	
@@ -60,11 +60,13 @@ ImplFile
                           YieldOrReturn
                             ((false, true), Ident x, (6,4--6,12),
                              { YieldOrReturnKeyword = (6,4--6,10) }),
-                          (5,4--6,12), { LetOrUseBangKeyword = (5,4--5,8)
+                          (5,4--6,12), { LetOrUseKeyword = (5,4--5,8)
+                                         InKeyword = None
                                          EqualsRange = Some (5,24--5,25) }),
                        (4,4--6,12), { LetOrUseKeyword = (4,4--4,7)
-                                      InKeyword = None }), (3,6--7,1)),
-                 (3,0--7,1)), (3,0--7,1))],
+                                      InKeyword = None
+                                      EqualsRange = Some (4,23--4,24) }),
+                    (3,6--7,1)), (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--7,1), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
       { ConditionalDirectives = []
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 01.fs.bsl
index 0aa056d6da5..865c5a7883d 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 01.fs.bsl	
@@ -46,7 +46,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident res, (6,4--6,14),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,14),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,18--4,19) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 02.fs.bsl
index 0f5f06df777..ed100564aef 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 02.fs.bsl	
@@ -50,7 +50,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident res, (6,4--6,14),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,14),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,20--4,21) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 03.fs.bsl
index 9d127609634..8c41c87de16 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 03.fs.bsl	
@@ -47,7 +47,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident name, (6,4--6,15),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,15),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,46--4,47) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 04.fs.bsl
index 2377382104e..1ad08e47ec6 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 04.fs.bsl	
@@ -45,7 +45,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident name, (6,4--6,15),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,15),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,44--4,45) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 05.fs.bsl
index 2309e7f9490..5fb229546c6 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 05.fs.bsl	
@@ -46,7 +46,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident name, (6,4--6,15),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,15),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,46--4,47) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 06.fs.bsl
index e46cfc2ef7c..5354fd61d49 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 06.fs.bsl	
@@ -52,7 +52,8 @@ ImplFile
                                    (6,17--6,18)), Ident value, (6,11--6,18)),
                              Ident value2, (6,11--6,25)), (6,4--6,25),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,25),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,23--4,24) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 07.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 07.fs.bsl
index 6bc6a07abec..31b4888fba6 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 07.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 07.fs.bsl	
@@ -48,7 +48,8 @@ ImplFile
                                    (6,17--6,18)), Ident value, (6,11--6,18)),
                              Ident value2, (6,11--6,25)), (6,4--6,25),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,25),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,21--4,22) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 08.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 08.fs.bsl
index 7ca03b4f9e3..f04efe243af 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 08.fs.bsl	
@@ -65,7 +65,8 @@ ImplFile
                                    (6,17--6,18)), Ident value, (6,11--6,18)),
                              Ident value2, (6,11--6,25)), (6,4--6,25),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,25),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,35--4,36) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 09.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 09.fs.bsl
index 0233ea37538..1da61fcb395 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 09.fs.bsl	
@@ -60,7 +60,8 @@ ImplFile
                                    (6,17--6,18)), Ident value, (6,11--6,18)),
                              Ident value2, (6,11--6,25)), (6,4--6,25),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,25),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,33--4,34) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 10.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 10.fs.bsl
index 4c616752ce3..49476bb21ad 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 10.fs.bsl	
@@ -57,7 +57,8 @@ ImplFile
                                    (6,13--6,14)), Ident x, (6,11--6,14)),
                              Ident b, (6,11--6,16)), (6,4--6,16),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,16),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,23--4,24) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 11.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 11.fs.bsl
index 4c4991234a3..7305918522c 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 11.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 11.fs.bsl	
@@ -54,7 +54,8 @@ ImplFile
                                    (6,13--6,14)), Ident x, (6,11--6,14)),
                              Ident b, (6,11--6,16)), (6,4--6,16),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,16),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,21--4,22) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 12.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 12.fs.bsl
index ffb04e5db54..db63b5cdd31 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 12.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 12.fs.bsl	
@@ -46,7 +46,8 @@ ImplFile
                                    (6,13--6,14)), Ident x, (6,11--6,14)),
                              Ident b, (6,11--6,16)), (6,4--6,16),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,16),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,16--4,17) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 13.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 13.fs.bsl
index b79f90358d2..8d94b1d4d5c 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 13.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 13.fs.bsl	
@@ -60,7 +60,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident first, (6,4--6,16),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,16),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,42--4,43) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 14.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 14.fs.bsl
index eaefd1aa4ef..795342f5742 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 14.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 14.fs.bsl	
@@ -54,7 +54,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident first, (6,4--6,16),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,16),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,40--4,41) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 15.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 15.fs.bsl
index e60943e9933..9fdf1440fc8 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 15.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 15.fs.bsl	
@@ -38,7 +38,8 @@ ImplFile
                              (Atomic, false, Ident asyncInt,
                               Const (Unit, (4,37--4,39)), (4,29--4,39)), [],
                            ImplicitZero (4,39--4,39), (4,4--5,16),
-                           { LetOrUseBangKeyword = (4,4--4,8)
+                           { LetOrUseKeyword = (4,4--4,8)
+                             InKeyword = None
                              EqualsRange = Some (4,27--4,28) }); Ident y],
                        [(5,15--5,16)], (4,4--5,18)), (3,6--7,1)), (3,0--7,1)),
               (3,0--7,1))],
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 16.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 16.fs.bsl
index d9f64778935..65d6bfa4f5d 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 16.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 16.fs.bsl	
@@ -62,7 +62,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Const (Unit, (6,11--6,13)), (6,4--6,13),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,13),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,27--4,28) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 17.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 17.fs.bsl
index f801b2d1319..ea88513f59c 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 17.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 17.fs.bsl	
@@ -65,7 +65,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Const (Unit, (6,11--6,13)), (6,4--6,13),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,13),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,27--4,28) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 18.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 18.fs.bsl
index 037d6651228..2b833c4e6dd 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 18.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed LetBang AndBang 18.fs.bsl	
@@ -56,7 +56,8 @@ ImplFile
                                    (6,13--6,14)), Ident x, (6,11--6,14)),
                              Ident b, (6,11--6,16)), (6,4--6,16),
                           { YieldOrReturnKeyword = (6,4--6,10) }), (4,4--6,16),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,23--4,24) }), (3,6--7,1)),
                  (3,0--7,1)), (3,0--7,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed UseBang 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed UseBang 01.fs.bsl
index a49e9a4abf3..68ffa0052e2 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed UseBang 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed UseBang 01.fs.bsl	
@@ -26,7 +26,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident res, (5,4--5,14),
                           { YieldOrReturnKeyword = (5,4--5,10) }), (4,4--5,14),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,18--4,19) }), (3,6--6,1)),
                  (3,0--6,1)), (3,0--6,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed UseBang 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed UseBang 02.fs.bsl
index d402cdf754d..d108dbbdb26 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed UseBang 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed UseBang 02.fs.bsl	
@@ -28,7 +28,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident res, (5,4--5,14),
                           { YieldOrReturnKeyword = (5,4--5,10) }), (4,4--5,14),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,20--4,21) }), (3,6--6,1)),
                  (3,0--6,1)), (3,0--6,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
diff --git a/tests/service/data/SyntaxTree/SynType/Typed UseBang 03.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed UseBang 03.fs.bsl
index a3eda56c6e0..7166b37a4b0 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed UseBang 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed UseBang 03.fs.bsl	
@@ -34,9 +34,11 @@ ImplFile
                              { YieldOrReturnKeyword = (4,23--4,29) }),
                           (4,21--4,33)), (4,15--4,33)), [],
                     ImplicitZero (4,33--4,33), (4,0--4,33),
-                    { LetOrUseBangKeyword = (4,0--4,4)
+                    { LetOrUseKeyword = (4,0--4,4)
+                      InKeyword = None
                       EqualsRange = Some (4,13--4,14) }), (3,0--4,33),
-                 { LetOrUseBangKeyword = (3,0--3,4)
+                 { LetOrUseKeyword = (3,0--3,4)
+                   InKeyword = None
                    EqualsRange = Some (3,11--3,12) }), (3,0--4,33))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--4,33), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/SynType/Typed UseBang 04.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed UseBang 04.fs.bsl
index 3bf8a0ce44c..6253c5c42c5 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed UseBang 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed UseBang 04.fs.bsl	
@@ -34,9 +34,11 @@ ImplFile
                              { YieldOrReturnKeyword = (4,23--4,29) }),
                           (4,21--4,33)), (4,15--4,33)), [],
                     ImplicitZero (4,33--4,33), (4,0--4,33),
-                    { LetOrUseBangKeyword = (4,0--4,4)
+                    { LetOrUseKeyword = (4,0--4,4)
+                      InKeyword = None
                       EqualsRange = Some (4,13--4,14) }), (3,0--4,33),
-                 { LetOrUseBangKeyword = (3,0--3,4)
+                 { LetOrUseKeyword = (3,0--3,4)
+                   InKeyword = None
                    EqualsRange = Some (3,11--3,12) }), (3,0--4,33))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--4,33), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/SynType/Typed UseBang 05.fs.bsl b/tests/service/data/SyntaxTree/SynType/Typed UseBang 05.fs.bsl
index 9042c097425..02b8514ab6a 100644
--- a/tests/service/data/SyntaxTree/SynType/Typed UseBang 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Typed UseBang 05.fs.bsl	
@@ -25,7 +25,8 @@ ImplFile
                        YieldOrReturn
                          ((false, true), Ident res, (5,4--5,14),
                           { YieldOrReturnKeyword = (5,4--5,10) }), (4,4--5,14),
-                       { LetOrUseBangKeyword = (4,4--4,8)
+                       { LetOrUseKeyword = (4,4--4,8)
+                         InKeyword = None
                          EqualsRange = Some (4,14--4,15) }), (3,6--6,1)),
                  (3,0--6,1)), (3,0--6,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,