From 041420c9027ef547173fb2851974ee8ccc22479e Mon Sep 17 00:00:00 2001
From: Florian Verdonck <florian.verdonck@outlook.com>
Date: Tue, 21 Nov 2023 15:38:46 +0100
Subject: [PATCH] Report auto property redux (#16116)

* Report property in PostInferenceChecks.

* Move property item creation back to CheckDeclarations.

* Use StringComparison.Ordinal

* Update unit test according to new world.

* Update tests

* Update SyntaxTree tests

* Update SyntaxTree tests

* Update unit tests

* Return single property tooltip.

* Maybe fix fsharpqa tests

* Maybe fix fsharpqa tests

* Update tests

* Update test

* Add tests for properties during critical errors.

* Add test for property symbol on interface.

* Revert PostInferenceChecks.fs

* Clean up

---------

Co-authored-by: Petr <psfinaki@users.noreply.github.com>
---
 src/Compiler/Checking/CheckDeclarations.fs    |  61 ++----
 src/Compiler/Checking/CheckExpressions.fs     |  27 ++-
 src/Compiler/Service/FSharpCheckerResults.fs  |  31 +++-
 src/Compiler/SyntaxTree/ParseHelpers.fs       |   2 +-
 src/Compiler/SyntaxTree/SyntaxTree.fs         |   6 +-
 src/Compiler/SyntaxTree/SyntaxTree.fsi        |   8 +-
 src/Compiler/SyntaxTree/SyntaxTreeOps.fs      |  27 +--
 src/Compiler/SyntaxTree/SyntaxTreeOps.fsi     |   2 -
 src/Compiler/pars.fsy                         |   8 +-
 .../MethodsAndProperties.fs                   |  10 +-
 ...ervice.SurfaceArea.netstandard20.debug.bsl |   4 +-
 ...vice.SurfaceArea.netstandard20.release.bsl |   4 +-
 .../AutoProperties/E_PrivateProperty01.fs     |   2 +-
 .../E_PropertyInvalidGetterSetter01.fs        |   2 +-
 .../E_PropertySetterUnit01.fs                 |   4 +-
 tests/service/ProjectAnalysisTests.fs         | 114 +++++-------
 tests/service/Symbols.fs                      | 174 +++++++++++-------
 ...ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl |   2 +-
 ...eturnTypeIsPartOfTriviaInProperties.fs.bsl |   4 +-
 ...itionalDirectiveAroundInlineKeyword.fs.bsl |   2 +-
 .../Binding/InlineKeywordInBinding.fs.bsl     |   4 +-
 ...nShouldBeIncludedInSynModuleDeclLet.fs.bsl |   3 +-
 ...BeIncludedInBindingOfSynExprObjExpr.fs.bsl |   2 +-
 ...dedInConstructorSynMemberDefnMember.fs.bsl |   2 +-
 ...tructorSynMemberDefnMemberOptAsSpec.fs.bsl |   2 +-
 ...edInFullSynMemberDefnMemberProperty.fs.bsl |   4 +-
 ...uldBeIncludedInSecondaryConstructor.fs.bsl |   6 +-
 ...eIncludedInSynMemberDefnLetBindings.fs.bsl |   2 +-
 ...ouldBeIncludedInSynMemberDefnMember.fs.bsl |   2 +-
 ...eShouldBeIncludedInSynModuleDeclLet.fs.bsl |   6 +-
 ...riteOnlySynMemberDefnMemberProperty.fs.bsl |   2 +-
 ...ignShouldBePresentInLocalLetBinding.fs.bsl |   2 +-
 ...ouldBePresentInLocalLetBindingTyped.fs.bsl |   2 +-
 ...lSignShouldBePresentInMemberBinding.fs.bsl |   2 +-
 ...resentInMemberBindingWithParameters.fs.bsl |   2 +-
 ...resentInMemberBindingWithReturnType.fs.bsl |   2 +-
 ...fEqualSignShouldBePresentInProperty.fs.bsl |   4 +-
 ...dBePresentInSynModuleDeclLetBinding.fs.bsl |  19 +-
 ...esentInSynModuleDeclLetBindingTyped.fs.bsl |   4 +-
 ...ldBePresentInSynExprLetOrUseBinding.fs.bsl |   7 +-
 ...dBePresentInSynModuleDeclLetBinding.fs.bsl |  19 +-
 ...nModuleDeclLetBindingWithAttributes.fs.bsl |  19 +-
 ...turnTypeOfBindingShouldContainStars.fs.bsl |   8 +-
 .../BlockCommentInSourceCode.fs.bsl           |   2 +-
 ...BeCapturedIfUsedInAnInvalidLocation.fs.bsl |   5 +-
 ...ipleSlashCommentShouldNotBeCaptured.fs.bsl |   6 +-
 ...tilineCommentAreNotReportedAsTrivia.fs.bsl |   6 +-
 ...ltilineStringAreNotReportedAsTrivia.fs.bsl |   5 +-
 .../NestedIfElseEndif.fs.bsl                  |  16 +-
 ...NestedIfEndifWithComplexExpressions.fs.bsl |   6 +-
 .../SingleIfElseEndif.fs.bsl                  |   6 +-
 .../ConditionalDirective/SingleIfEndif.fs.bsl |   6 +-
 ...uldContainsTheRangeOfTheWithKeyword.fs.bsl |   2 +-
 .../Expression/AnonymousRecords-06.fs.bsl     |   2 +-
 .../Expression/Binary - Plus 05.fs.bsl        |   4 +-
 .../data/SyntaxTree/Expression/Do 03.fs.bsl   |   4 +-
 .../data/SyntaxTree/Expression/Do 04.fs.bsl   |   4 +-
 .../data/SyntaxTree/Expression/Do 05.fs.bsl   |   4 +-
 .../DotLambda - _ Recovery - Casts.fsx.bsl    |  15 +-
 ...umentExpressionInInnerAppExpression.fs.bsl |   4 +-
 ...bda_FunctionWithUnderscoreDotLambda.fs.bsl |   3 +-
 ...bda_NestedPropertiesAfterUnderscore.fs.bsl |   3 +-
 ...NotAllowedFunctionExpressionWithArg.fs.bsl |   4 +-
 .../Expression/DotLambda_TopLevelLet.fs.bsl   |   4 +-
 ...tionNallWithSpaceAndUnitApplication.fs.bsl |   3 +-
 ...DotLambda_WithNonTupledFunctionCall.fs.bsl |   3 +-
 .../data/SyntaxTree/Expression/For 03.fs.bsl  |   4 +-
 .../data/SyntaxTree/Expression/For 04.fs.bsl  |   4 +-
 .../data/SyntaxTree/Expression/For 05.fs.bsl  |   4 +-
 .../data/SyntaxTree/Expression/If 08.fs.bsl   |   4 +-
 .../data/SyntaxTree/Expression/If 09.fs.bsl   |   4 +-
 .../data/SyntaxTree/Expression/If 10.fs.bsl   |   4 +-
 .../data/SyntaxTree/Expression/Lazy 01.fs.bsl |   4 +-
 .../data/SyntaxTree/Expression/Lazy 02.fs.bsl |   4 +-
 .../data/SyntaxTree/Expression/Lazy 03.fs.bsl |   4 +-
 .../data/SyntaxTree/Expression/Let 01.fs.bsl  |  10 +-
 .../data/SyntaxTree/Expression/Let 02.fs.bsl  |   4 +-
 ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl |   7 +-
 .../Expression/Object - Class 01.fs.bsl       |   2 +-
 .../Expression/Object - Class 02.fs.bsl       |   4 +-
 .../Expression/Object - Class 03.fs.bsl       |   6 +-
 .../Expression/Object - Class 07.fs.bsl       |   2 +-
 .../Expression/Object - Class 08.fs.bsl       |   2 +-
 .../Expression/Object - Class 09.fs.bsl       |   2 +-
 .../Expression/Object - Class 10.fs.bsl       |   2 +-
 .../Expression/Object - Class 11.fs.bsl       |   4 +-
 .../Expression/Object - Class 12.fs.bsl       |   4 +-
 .../Expression/Object - Class 13.fs.bsl       |   4 +-
 .../Expression/Object - Class 14.fs.bsl       |   4 +-
 .../Expression/Object - Class 15.fs.bsl       |   2 +-
 .../data/SyntaxTree/Expression/Set 04.fs.bsl  |   4 +-
 ...xprDoContainsTheRangeOfTheDoKeyword.fs.bsl |   5 +-
 ...LetOrUseContainsTheRangeOfInKeyword.fs.bsl |   2 +-
 ...seDoesNotContainTheRangeOfInKeyword.fs.bsl |   2 +-
 ...rsDoesNotContainTheRangeOfInKeyword.fs.bsl |   2 +-
 ...eBindingContainsTheRangeOfInKeyword.fs.bsl |   4 +-
 ...bjExprContainsTheRangeOfWithKeyword.fs.bsl |   4 +-
 .../Expression/SynExprObjWithSetter.fs.bsl    |   2 +-
 .../Expression/Try - Finally 01.fs.bsl        |   4 +-
 .../Expression/Try - Finally 02.fs.bsl        |   4 +-
 .../Expression/Try - Finally 03.fs.bsl        |   4 +-
 .../Expression/Try - Finally 04.fs.bsl        |   4 +-
 .../Expression/Try - With 01.fs.bsl           |   4 +-
 .../Expression/Try - With 02.fs.bsl           |   4 +-
 .../Expression/Try - With 03.fs.bsl           |   4 +-
 .../Expression/Try - With 04.fs.bsl           |   4 +-
 .../Expression/Try - With 05.fs.bsl           |   4 +-
 .../Expression/Try - With 06.fs.bsl           |   4 +-
 .../Expression/Try - With 07.fs.bsl           |   4 +-
 .../Expression/Try - With 08.fs.bsl           |   4 +-
 .../Expression/Try - With 09.fs.bsl           |   4 +-
 .../data/SyntaxTree/Expression/Try 01.fs.bsl  |   4 +-
 .../data/SyntaxTree/Expression/Try 02.fs.bsl  |   4 +-
 .../Try with - Missing expr 04.fs.bsl         |   2 +-
 .../Expression/Tuple - Missing item 10.fs.bsl |   5 +-
 .../Expression/Tuple - Missing item 11.fs.bsl |  12 +-
 .../Unfinished escaped ident 02.fs.bsl        |   4 +-
 .../SyntaxTree/Expression/While 03.fs.bsl     |   4 +-
 .../SyntaxTree/Expression/While 04.fs.bsl     |   4 +-
 .../SyntaxTree/Expression/While 05.fs.bsl     |   4 +-
 .../SyntaxTree/Expression/While 06.fs.bsl     |   4 +-
 .../SyntaxTree/Expression/WhileBang 03.fs.bsl |   4 +-
 .../SyntaxTree/Expression/WhileBang 04.fs.bsl |   4 +-
 .../SyntaxTree/Expression/WhileBang 05.fs.bsl |   4 +-
 .../SyntaxTree/Expression/WhileBang 06.fs.bsl |   4 +-
 .../data/SyntaxTree/Extern/Extern 01.fs.bsl   |   2 +-
 .../ExternKeywordIsPresentInTrivia.fs.bsl     |   3 +-
 .../LeadingKeyword/AndKeyword.fs.bsl          |   4 +-
 .../LeadingKeyword/DoKeyword.fs.bsl           |   2 +-
 .../LeadingKeyword/DoStaticKeyword.fs.bsl     |   2 +-
 .../LeadingKeyword/ExternKeyword.fs.bsl       |   3 +-
 .../LeadingKeyword/LetKeyword.fs.bsl          |   2 +-
 .../LeadingKeyword/LetRecKeyword.fs.bsl       |   2 +-
 .../LeadingKeyword/MemberKeyword.fs.bsl       |   2 +-
 .../LeadingKeyword/NewKeyword.fs.bsl          |   2 +-
 .../LeadingKeyword/OverrideKeyword.fs.bsl     |   2 +-
 .../LeadingKeyword/StaticLetKeyword.fs.bsl    |   2 +-
 .../LeadingKeyword/StaticLetRecKeyword.fs.bsl |   2 +-
 .../LeadingKeyword/StaticMemberKeyword.fs.bsl |   2 +-
 .../LeadingKeyword/SyntheticKeyword.fs.bsl    |   2 +-
 .../LeadingKeyword/UseKeyword.fs.bsl          |   2 +-
 .../LeadingKeyword/UseRecKeyword.fs.bsl       |   2 +-
 .../MatchClause/Missing expr 05.fs.bsl        |   4 +-
 .../RangeOfMultipleSynMatchClause.fs.bsl      |   2 +-
 .../RangeOfSingleSynMatchClause.fs.bsl        |   2 +-
 ...OfSingleSynMatchClauseFollowedByBar.fs.bsl |   2 +-
 ...easureContainsTheRangeOfTheConstant.fs.bsl |  10 +-
 .../SyntaxTree/Member/Auto property 09.fs.bsl |   2 +-
 .../SyntaxTree/Member/Auto property 13.fs.bsl |   2 +-
 .../data/SyntaxTree/Member/Do 01.fs.bsl       |   4 +-
 .../data/SyntaxTree/Member/Do 02.fs.bsl       |   4 +-
 .../data/SyntaxTree/Member/Do 03.fs.bsl       |   4 +-
 .../data/SyntaxTree/Member/Do 04.fs.bsl       |   4 +-
 .../SyntaxTree/Member/GetSetMember 01.fs.bsl  |   8 +-
 .../GetSetMemberWithInlineKeyword.fs.bsl      |   4 +-
 .../data/SyntaxTree/Member/Inherit 05.fs.bsl  |   2 +-
 .../data/SyntaxTree/Member/Inherit 08.fs.bsl  |   2 +-
 .../SyntaxTree/Member/Interface 01.fs.bsl     |   5 +-
 .../SyntaxTree/Member/Interface 02.fs.bsl     |   2 +-
 .../SyntaxTree/Member/Interface 05.fs.bsl     |   6 +-
 .../SyntaxTree/Member/Interface 06.fs.bsl     |   2 +-
 .../SyntaxTree/Member/Interface 07.fs.bsl     |   2 +-
 .../SyntaxTree/Member/Interface 08.fs.bsl     |   2 +-
 .../data/SyntaxTree/Member/Let 01.fs.bsl      |   4 +-
 .../data/SyntaxTree/Member/Let 02.fs.bsl      |   4 +-
 .../data/SyntaxTree/Member/Let 03.fs.bsl      |   4 +-
 .../data/SyntaxTree/Member/Let 04.fs.bsl      |   2 +-
 .../Member/Member - Attributes 01.fs.bsl      |   6 +-
 .../Member - Param - Missing type 01.fs.bsl   |   2 +-
 .../data/SyntaxTree/Member/Member 01.fs.bsl   |   6 +-
 .../data/SyntaxTree/Member/Member 02.fs.bsl   |   6 +-
 .../data/SyntaxTree/Member/Member 03.fs.bsl   |   6 +-
 .../data/SyntaxTree/Member/Member 04.fs.bsl   |   6 +-
 .../data/SyntaxTree/Member/Member 05.fs.bsl   |   6 +-
 .../data/SyntaxTree/Member/Member 06.fs.bsl   |   6 +-
 .../data/SyntaxTree/Member/Member 07.fs.bsl   |   6 +-
 .../data/SyntaxTree/Member/Member 08.fs.bsl   |   2 +-
 .../data/SyntaxTree/Member/Member 09.fs.bsl   |   2 +-
 .../data/SyntaxTree/Member/Member 10.fs.bsl   |   2 +-
 .../data/SyntaxTree/Member/Member 11.fs.bsl   |   2 +-
 .../data/SyntaxTree/Member/Member 12.fs.bsl   |   2 +-
 .../Member/MemberWithInlineKeyword.fs.bsl     |   2 +-
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |   2 +-
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |   4 +-
 .../data/SyntaxTree/Member/Static 01.fs.bsl   |   4 +-
 .../data/SyntaxTree/Member/Static 02.fs.bsl   |   6 +-
 .../data/SyntaxTree/Member/Static 03.fs.bsl   |   6 +-
 ...eDefnWithMemberWithGetHasXmlComment.fs.bsl |   2 +-
 .../SynTypeDefnWithMemberWithSetget.fs.bsl    |   4 +-
 ...nTypeDefnWithStaticMemberWithGetset.fs.bsl |   5 +-
 ...berContainsTheRangeOfTheWithKeyword.fs.bsl |   2 +-
 ...ynExprObjMembersHaveCorrectKeywords.fs.bsl |   9 +-
 ...fnMemberSynValDataHasCorrectKeyword.fs.bsl |   8 +-
 .../SyntaxTree/ModuleMember/Let 01.fs.bsl     |  10 +-
 .../SyntaxTree/ModuleMember/Let 02.fs.bsl     |   4 +-
 .../SyntaxTree/ModuleMember/Let 03.fs.bsl     |   4 +-
 .../Module - Attribute 01.fs.bsl              |   4 +-
 .../ModuleShouldContainModuleKeyword.fs.bsl   |   2 +-
 ...angeThatStartsAtTheNamespaceKeyword.fs.bsl |  14 +-
 ...espaceShouldContainNamespaceKeyword.fs.bsl |   2 +-
 .../NestedModuleWithBeginEndAndDecls.fs.bsl   |   2 +-
 .../ActivePatternDefinition.fs.bsl            |   2 +-
 ...ivePatternIdentifierInPrivateMember.fs.bsl |   2 +-
 .../CustomOperatorDefinition.fs.bsl           |   2 +-
 .../ObjectModelWithTwoMembers.fs.bsl          |   6 +-
 .../OperatorInMemberDefinition.fs.bsl         |   2 +-
 .../PartialActivePatternDefinition.fs.bsl     |   2 +-
 ...ePatternDefinitionWithoutParameters.fs.bsl |   3 +-
 .../QualifiedOperatorExpression.fs.bsl        |   2 +-
 .../SyntaxTree/Pattern/InHeadPattern.fs.bsl   |   3 +-
 .../Pattern/OperatorInSynPatLongIdent.fs.bsl  |   3 +-
 .../Pattern/Tuple - HeadPat 01.fs.bsl         |   6 +-
 .../Pattern/Tuple - HeadPat 02.fs.bsl         |   3 +-
 .../Pattern/Tuple - Recover 01.fs.bsl         |   3 +-
 .../Pattern/Tuple - Recover 02.fs.bsl         |   3 +-
 .../Pattern/Tuple - Recover 03.fs.bsl         |   6 +-
 .../Pattern/Tuple - Recover 04.fs.bsl         |   9 +-
 .../Pattern/Tuple - Struct 01.fs.bsl          |   3 +-
 .../Pattern/Typed - Missing type 01.fs.bsl    |   4 +-
 .../Pattern/Typed - Missing type 02.fs.bsl    |   4 +-
 .../Pattern/Typed - Missing type 03.fs.bsl    |   3 +-
 .../Pattern/Typed - Missing type 04.fs.bsl    |   3 +-
 .../Pattern/Typed - Missing type 05.fs.bsl    |   2 +-
 .../Pattern/Typed - Missing type 06.fs.bsl    |   2 +-
 .../Pattern/Typed - Missing type 09.fs.bsl    |   2 +-
 .../Pattern/Typed - Missing type 10.fs.bsl    |   2 +-
 .../Pattern/Typed - Missing type 11.fs.bsl    |   2 +-
 .../Pattern/Typed - Missing type 12.fs.bsl    |   2 +-
 .../SimplePats/SimplePats - Recover 01.fs.bsl |   8 +-
 .../SimplePats/SimplePats 01.fs.bsl           |  11 +-
 .../InterpolatedStringOffsideInModule.fs.bsl  |   2 +-
 ...nterpolatedStringOffsideInNestedLet.fs.bsl |   7 +-
 ...stBytesWithSynByteStringKindRegular.fs.bsl |   3 +-
 ...tBytesWithSynByteStringKindVerbatim.fs.bsl |   3 +-
 ...ConstStringWithSynStringKindRegular.fs.bsl |   6 +-
 ...tStringWithSynStringKindTripleQuote.fs.bsl |   5 +-
 ...onstStringWithSynStringKindVerbatim.fs.bsl |   5 +-
 ...latedStringWithSynStringKindRegular.fs.bsl |   5 +-
 ...dStringWithSynStringKindTripleQuote.fs.bsl |   5 +-
 ...atedStringWithSynStringKindVerbatim.fs.bsl |   5 +-
 ...tringWithTripleQuoteMultipleDollars.fs.bsl |   5 +-
 .../Constraint intersection 01.fs.bsl         |   2 +-
 .../SynType/Constraint intersection 01.fs.bsl |   2 +-
 .../SynType/Constraint intersection 02.fs.bsl |   2 +-
 .../data/SyntaxTree/SynType/Fun 06.fs.bsl     |   4 +-
 .../data/SyntaxTree/SynType/Fun 07.fs.bsl     |   4 +-
 .../data/SyntaxTree/SynType/Fun 08.fs.bsl     |   4 +-
 .../data/SyntaxTree/SynType/Fun 09.fs.bsl     |   4 +-
 .../data/SyntaxTree/SynType/Fun 10.fs.bsl     |   4 +-
 ...stedSynTypeOrInsideSynExprTraitCall.fs.bsl |   2 +-
 ...SingleSynTypeInsideSynExprTraitCall.fs.bsl |   2 +-
 .../SynTypeOrInsideSynExprTraitCall.fs.bsl    |   2 +-
 ...eConstraintWhereTyparSupportsMember.fs.bsl |   3 +-
 ...TypeOrWithAppTypeOnTheRightHandSide.fs.bsl |   2 +-
 .../data/SyntaxTree/SynType/Tuple 09.fs.bsl   |   4 +-
 .../data/SyntaxTree/SynType/Tuple 10.fs.bsl   |   4 +-
 .../data/SyntaxTree/SynType/Tuple 11.fs.bsl   |   4 +-
 .../data/SyntaxTree/SynType/Tuple 12.fs.bsl   |   4 +-
 .../data/SyntaxTree/SynType/Tuple 13.fs.bsl   |   4 +-
 .../data/SyntaxTree/SynType/Tuple 14.fs.bsl   |   4 +-
 .../data/SyntaxTree/Type/Class 02.fs.bsl      |   2 +-
 .../data/SyntaxTree/Type/Record 01.fs.bsl     |   3 +-
 .../data/SyntaxTree/Type/Record 02.fs.bsl     |   3 +-
 ...aceContainsTheRangeOfTheWithKeyword.fs.bsl |   3 +-
 ...ionContainsTheRangeOfTheWithKeyword.fs.bsl |   2 +-
 ...ordContainsTheRangeOfTheWithKeyword.fs.bsl |   2 +-
 .../Type/SynTypeTupleWithStruct.fs.bsl        |   4 +-
 .../SynTypeTupleWithStructRecovery.fs.bsl     |   4 +-
 .../data/SyntaxTree/Type/Type 07.fs.bsl       |   2 +-
 .../data/SyntaxTree/Type/Type 10.fs.bsl       |   3 +-
 .../data/SyntaxTree/Type/With 01.fs.bsl       |   2 +-
 .../data/SyntaxTree/Type/With 04.fs.bsl       |   2 +-
 .../UnionCase/Missing keyword of.fs.bsl       |   9 +-
 .../Tests.LanguageService.GotoDefinition.fs   |   8 +-
 274 files changed, 732 insertions(+), 788 deletions(-)

diff --git a/src/Compiler/Checking/CheckDeclarations.fs b/src/Compiler/Checking/CheckDeclarations.fs
index dd9fab43504..54fd5a756a4 100644
--- a/src/Compiler/Checking/CheckDeclarations.fs
+++ b/src/Compiler/Checking/CheckDeclarations.fs
@@ -997,25 +997,30 @@ module MutRecBindingChecking =
                     for b1, b2 in List.pairwise defnAs do
                         match b1, b2 with
                         | TyconBindingPhase2A.Phase2AMember {
-                            SyntacticBinding = NormalizedBinding(valSynData = SynValData(transformedFromProperty = Some getPropertyIdent; memberFlags = Some mf))
+                            SyntacticBinding = NormalizedBinding(pat = SynPat.Named(ident = SynIdent(ident = getIdent)); valSynData = SynValData(memberFlags = Some mf))
                             RecBindingInfo = RecursiveBindingInfo(vspec = vGet)
                           },
                           TyconBindingPhase2A.Phase2AMember {
-                            SyntacticBinding = NormalizedBinding(valSynData = SynValData(transformedFromProperty = Some setPropertyIdent))
+                            SyntacticBinding = NormalizedBinding(pat = SynPat.Named(ident = SynIdent(ident = setIdent)))
                             RecBindingInfo = RecursiveBindingInfo(vspec = vSet)
-                          } when Range.equals getPropertyIdent.idRange setPropertyIdent.idRange ->
+                          } when Range.equals getIdent.idRange setIdent.idRange ->
                             match  vGet.ApparentEnclosingEntity with
                             | ParentNone -> ()
                             | Parent parentRef ->
-                            let apparentEnclosingType =  generalizedTyconRef g parentRef
-                            let vGet, vSet = if mf.MemberKind = SynMemberKind.PropertyGet then vGet, vSet else vSet, vGet
-                            let item =
-                                Item.Property(
-                                    getPropertyIdent.idText,
-                                    [ PropInfo.FSProp(g, apparentEnclosingType, Some (mkLocalValRef vGet), Some (mkLocalValRef vSet)) ],
-                                    Some getPropertyIdent.idRange
-                                )
-                            CallNameResolutionSink cenv.tcSink (getPropertyIdent.idRange, envForTycon.NameEnv, item, emptyTyparInst, ItemOccurence.Binding, envForTycon.eAccessRights)
+                                let apparentEnclosingType =  generalizedTyconRef g parentRef
+                                let vGet, vSet = if mf.MemberKind = SynMemberKind.PropertyGet then vGet, vSet else vSet, vGet
+                                let propertyName =
+                                    if vGet.Id.idText.StartsWith("get_", StringComparison.Ordinal) then
+                                        vGet.Id.idText.Replace("get_", "")
+                                    else
+                                        vGet.Id.idText
+                                let item =
+                                    Item.Property(
+                                        propertyName,
+                                        [ PropInfo.FSProp(g, apparentEnclosingType, Some (mkLocalValRef vGet), Some (mkLocalValRef vSet)) ],
+                                        Some getIdent.idRange
+                                    )
+                                CallNameResolutionSink cenv.tcSink (getIdent.idRange, envForTycon.NameEnv, item, emptyTyparInst, ItemOccurence.Binding, envForTycon.eAccessRights)
                         | _ -> ()
 
                 // If no constructor call, insert Phase2AIncrClassCtorJustAfterSuperInit at start
@@ -4263,6 +4268,8 @@ module TcDeclarations =
                 // Only the keep the non-field-targeted attributes
                 let attribs = attribs |> List.filter (fun a -> match a.Target with Some t when t.idText = "field" -> false | _ -> true)
                 let fldId = ident (CompilerGeneratedName id.idText, mMemberPortion)
+                let headPatIds = if isStatic then [id] else [ident ("__", mMemberPortion);id]
+                let headPat = SynPat.LongIdent (SynLongIdent(headPatIds, [], List.replicate headPatIds.Length None), None, Some noInferredTypars, SynArgPats.Pats [], None, mMemberPortion)
                 let memberFlags = { memberFlags with GetterOrSetterIsCompilerGenerated = true }
                 let memberFlagsForSet = { memberFlagsForSet with GetterOrSetterIsCompilerGenerated = true }
 
@@ -4279,20 +4286,7 @@ module TcDeclarations =
                             let rhsExpr = SynExpr.Ident fldId
                             let retInfo = match tyOpt with None -> None | Some ty -> Some (None, SynReturnInfo((ty, SynInfo.unnamedRetVal), ty.Range))
                             let attribs = mkAttributeList attribs mMemberPortion
-                            let headPatIds =
-                                let id =
-                                    match mGetSetOpt with
-                                    | Some (GetSetKeywords.GetSet(get = mGet)) -> Ident(id.idText, mGet)
-                                    | _ -> id
-                                if isStatic then [id] else [ident ("__", mMemberPortion);id]
-                            let headPat = SynPat.LongIdent (SynLongIdent(headPatIds, [], List.replicate headPatIds.Length None), None, Some noInferredTypars, SynArgPats.Pats [], None, mMemberPortion)
                             let binding = mkSynBinding (xmlDoc, headPat) (access, false, false, mMemberPortion, DebugPointAtBinding.NoneAtInvisible, retInfo, rhsExpr, rhsExpr.Range, [], attribs, Some memberFlags, SynBindingTrivia.Zero)
-                            let binding =
-                                match mGetSetOpt with
-                                | Some (GetSetKeywords.GetSet _) ->
-                                    // Only add the additional meta data to the SynBinding (SynValData) is both get and set are present.
-                                    updatePropertyIdentInSynBinding id binding
-                                | _ -> binding
                             SynMemberDefn.Member (binding, mMemberPortion) 
                         yield getter
                     | _ -> ()
@@ -4301,25 +4295,10 @@ module TcDeclarations =
                     | SynMemberKind.PropertySet 
                     | SynMemberKind.PropertyGetSet -> 
                         let setter = 
-                            let vId = 
-                                match mGetSetOpt with
-                                | Some (GetSetKeywords.GetSet(set = mSet)) -> ident("v", mSet)
-                                | _ -> ident("v", mMemberPortion)
-                            let headPatIds =
-                                let id =
-                                    match mGetSetOpt with
-                                    | Some (GetSetKeywords.GetSet(set = mSet)) -> Ident(id.idText, mSet)
-                                    | _ -> id
-                                if isStatic then [id] else [ident ("__", mMemberPortion);id]
+                            let vId = ident("v", mMemberPortion)
                             let headPat = SynPat.LongIdent (SynLongIdent(headPatIds, [], List.replicate headPatIds.Length None), None, Some noInferredTypars, SynArgPats.Pats [mkSynPatVar None vId], None, mMemberPortion)
                             let rhsExpr = mkSynAssign (SynExpr.Ident fldId) (SynExpr.Ident vId)
                             let binding = mkSynBinding (xmlDoc, headPat) (access, false, false, mMemberPortion, DebugPointAtBinding.NoneAtInvisible, None, rhsExpr, rhsExpr.Range, [], [], Some memberFlagsForSet, SynBindingTrivia.Zero)
-                            let binding =
-                                match mGetSetOpt with
-                                | Some (GetSetKeywords.GetSet _) ->
-                                    // Only add the additional meta data to the SynBinding (SynValData) is both get and set are present.
-                                    updatePropertyIdentInSynBinding id binding
-                                | _ -> binding
                             SynMemberDefn.Member (binding, mMemberPortion)
                         yield setter 
                     | _ -> ()]
diff --git a/src/Compiler/Checking/CheckExpressions.fs b/src/Compiler/Checking/CheckExpressions.fs
index 4b4bb2b4025..b268e80bf0b 100644
--- a/src/Compiler/Checking/CheckExpressions.fs
+++ b/src/Compiler/Checking/CheckExpressions.fs
@@ -2354,7 +2354,7 @@ module BindingNormalization =
         NormalizedBindingPat(SynPat.InstanceMember(thisId, memberId, toolId, vis, m), PushMultiplePatternsToRhs cenv true args rhsExpr, valSynData, typars)
 
     let private NormalizeStaticMemberBinding (cenv: cenv) (memberFlags: SynMemberFlags) valSynData id vis typars args m rhsExpr =
-        let (SynValData(valInfo = valSynInfo; thisIdOpt = thisIdOpt; transformedFromProperty = tp)) = valSynData
+        let (SynValData(valInfo = valSynInfo; thisIdOpt = thisIdOpt)) = valSynData
         if memberFlags.IsInstance then
             // instance method without adhoc "this" argument
             error(Error(FSComp.SR.tcInstanceMemberRequiresTarget(), m))
@@ -2368,7 +2368,7 @@ module BindingNormalization =
         // static property: these transformed into methods taking one "unit" argument
         | [], SynMemberKind.Member ->
             let memberFlags = {memberFlags with MemberKind = SynMemberKind.PropertyGet}
-            let valSynData = SynValData(Some memberFlags, valSynInfo, thisIdOpt, tp)
+            let valSynData = SynValData(Some memberFlags, valSynInfo, thisIdOpt)
             NormalizedBindingPat(mkSynPatVar vis id,
                                  PushOnePatternToRhs cenv true (SynPat.Const(SynConst.Unit, m)) rhsExpr,
                                  valSynData,
@@ -2376,7 +2376,7 @@ module BindingNormalization =
         | _ -> MakeNormalizedStaticOrValBinding cenv ValOrMemberBinding id vis typars args rhsExpr valSynData
 
     let private NormalizeInstanceMemberBinding (cenv: cenv) (memberFlags: SynMemberFlags) valSynData thisId memberId (toolId: Ident option) vis typars args m rhsExpr =
-        let (SynValData(_, valSynInfo, thisIdOpt, tap)) = valSynData
+        let (SynValData(_, valSynInfo, thisIdOpt)) = valSynData
 
         if not memberFlags.IsInstance then
             // static method with adhoc "this" argument
@@ -2400,7 +2400,7 @@ module BindingNormalization =
                 (SynPat.InstanceMember(thisId, memberId, toolId, vis, m),
                  PushOnePatternToRhs cenv true (SynPat.Const(SynConst.Unit, m)) rhsExpr,
                  // Update the member info to record that this is a SynMemberKind.PropertyGet
-                 SynValData(Some memberFlags, valSynInfo, thisIdOpt, tap),
+                 SynValData(Some memberFlags, valSynInfo, thisIdOpt),
                  typars)
 
         | _ ->
@@ -2511,10 +2511,10 @@ module EventDeclarationNormalization =
         | _ -> error(BadEventTransformation m)
 
     let private ConvertSynData m valSynData =
-        let (SynValData(memberFlagsOpt, valSynInfo, thisIdOpt, tap)) = valSynData
+        let (SynValData(memberFlagsOpt, valSynInfo, thisIdOpt)) = valSynData
         let memberFlagsOpt = ConvertMemberFlagsOpt m memberFlagsOpt
         let valSynInfo = ConvertSynInfo m valSynInfo
-        SynValData(memberFlagsOpt, valSynInfo, thisIdOpt, tap)
+        SynValData(memberFlagsOpt, valSynInfo, thisIdOpt)
 
     let rec private RenameBindingPattern f declPattern =
         match declPattern with
@@ -10557,8 +10557,8 @@ and TcNormalizedBinding declKind (cenv: cenv) env tpenv overallTy safeThisValOpt
                 match rotRetSynAttrs with
                 | [] -> valSynData
                 | {Range=mHead} :: _ ->
-                let (SynValData(valMf, SynValInfo(args, SynArgInfo(attrs, opt, retId)), valId, tap)) = valSynData
-                SynValData(valMf, SynValInfo(args, SynArgInfo({Attributes=rotRetSynAttrs; Range=mHead} :: attrs, opt, retId)), valId, tap)
+                let (SynValData(valMf, SynValInfo(args, SynArgInfo(attrs, opt, retId)), valId)) = valSynData
+                SynValData(valMf, SynValInfo(args, SynArgInfo({Attributes=rotRetSynAttrs; Range=mHead} :: attrs, opt, retId)), valId)
             retAttribs, valAttribs, valSynData
 
         let isVolatile = HasFSharpAttribute g g.attrib_VolatileFieldAttribute valAttribs     
@@ -11551,7 +11551,6 @@ and AnalyzeRecursiveInstanceMemberDecl
         thisId,
         memberId: Ident,
         toolId: Ident option,
-        isTransformedProperty: bool,
         bindingAttribs,
         vis2,
         tcrefContainerInfo,
@@ -11610,12 +11609,11 @@ and AnalyzeRecursiveInstanceMemberDecl
              | None -> None
 
          let memberInfo = MakeMemberDataAndMangledNameForMemberVal(g, tcref, isExtrinsic, bindingAttribs, optInferredImplSlotTys, memberFlags, valSynInfo, memberId, false)
-         // This line factored in the 'get' or 'set' as the identifier for a property declaration using "with get () = ... and set v = ..."
+         // We used to factored in the 'get' or 'set' as the identifier for a property declaration using "with get () = ... and set v = ..."
          // It has been removed from FSharp.Compiler.Service because we want the property name to be the location of
          // the definition of these symbols.
          //
          // See https://github.com/fsharp/FSharp.Compiler.Service/issues/79.
-         let memberId = match toolId with Some tid when isTransformedProperty -> ident(memberId.idText, tid.idRange) | _ -> memberId
 
          envinner, tpenv, memberId, toolId, Some memberInfo, vis, vis2, None, enclosingDeclaredTypars, baseValOpt, explicitTyparInfo, bindingRhs, declaredTypars
      | _ ->
@@ -11630,7 +11628,6 @@ and AnalyzeRecursiveDecl
          declaredTypars,
          thisIdOpt,
          valSynInfo,
-         isTransformedProperty,
          explicitTyparInfo,
          newslotsOK,
          overridesOK,
@@ -11675,7 +11672,7 @@ and AnalyzeRecursiveDecl
             AnalyzeRecursiveInstanceMemberDecl
                 (cenv, envinner, tpenv, declKind,
                  synTyparDecls, valSynInfo, explicitTyparInfo, newslotsOK,
-                 overridesOK, vis1, thisId, memberId, toolId, isTransformedProperty,
+                 overridesOK, vis1, thisId, memberId, toolId,
                  bindingAttribs, vis2, tcrefContainerInfo,
                  memberFlagsOpt, ty, bindingRhs, mBinding)
 
@@ -11705,7 +11702,7 @@ and AnalyzeAndMakeAndPublishRecursiveValue
     // Pull apart the inputs
     let (NormalizedBinding(vis1, bindingKind, isInline, isMutable, bindingSynAttribs, bindingXmlDoc, synTyparDecls, valSynData, declPattern, bindingRhs, mBinding, debugPoint)) = binding
     let (NormalizedBindingRhs(_, _, bindingExpr)) = bindingRhs
-    let (SynValData(memberFlagsOpt, valSynInfo, thisIdOpt, transformedFromProperty)) = valSynData
+    let (SynValData(memberFlagsOpt, valSynInfo, thisIdOpt)) = valSynData
     let (ContainerInfo(altActualParent, tcrefContainerInfo)) = containerInfo
 
     let attrTgt = declKind.AllowedAttribTargets memberFlagsOpt
@@ -11729,7 +11726,7 @@ and AnalyzeAndMakeAndPublishRecursiveValue
     let envinner, tpenv, bindingId, toolIdOpt, memberInfoOpt, vis, vis2, safeThisValOpt, enclosingDeclaredTypars, baseValOpt, explicitTyparInfo, bindingRhs, declaredTypars =
 
         AnalyzeRecursiveDecl (cenv, envinner, tpenv, declKind, synTyparDecls, declaredTypars, thisIdOpt, valSynInfo,
-                              transformedFromProperty.IsSome, explicitTyparInfo,
+                              explicitTyparInfo,
                               newslotsOK, overridesOK, vis1, declPattern, bindingAttribs, tcrefContainerInfo,
                               memberFlagsOpt, ty, bindingRhs, mBinding)
 
diff --git a/src/Compiler/Service/FSharpCheckerResults.fs b/src/Compiler/Service/FSharpCheckerResults.fs
index 6677cd6d026..8f0f612fe5e 100644
--- a/src/Compiler/Service/FSharpCheckerResults.fs
+++ b/src/Compiler/Service/FSharpCheckerResults.fs
@@ -1968,12 +1968,31 @@ type internal TypeCheckInfo
                     match declItemsOpt with
                     | None -> emptyToolTip
                     | Some (items, denv, _, m) ->
-                        ToolTipText(
-                            items
-                            |> List.map (fun x ->
-                                let symbol = Some(FSharpSymbol.Create(cenv, x.Item))
-                                FormatStructuredDescriptionOfItem false infoReader tcAccessRights m denv x.ItemWithInst symbol width)
-                        ))
+                        match items with
+                        | [ { Kind = CompletionItemKind.Property } as prop
+                            { Kind = CompletionItemKind.Field }
+                            { Kind = CompletionItemKind.Field } ] ->
+                            let symbol = FSharpSymbol.Create(cenv, prop.Item)
+
+                            let tt =
+                                FormatStructuredDescriptionOfItem
+                                    false
+                                    infoReader
+                                    tcAccessRights
+                                    m
+                                    denv
+                                    prop.ItemWithInst
+                                    (Some symbol)
+                                    width
+
+                            ToolTipText([ tt ])
+                        | _ ->
+                            ToolTipText(
+                                items
+                                |> List.map (fun x ->
+                                    let symbol = Some(FSharpSymbol.Create(cenv, x.Item))
+                                    FormatStructuredDescriptionOfItem false infoReader tcAccessRights m denv x.ItemWithInst symbol width)
+                            ))
                 (fun err ->
                     Trace.TraceInformation(sprintf "FCS: recovering from error in GetStructuredToolTipText: '%s'" err)
                     ToolTipText [ ToolTipElement.CompositionError err ])
diff --git a/src/Compiler/SyntaxTree/ParseHelpers.fs b/src/Compiler/SyntaxTree/ParseHelpers.fs
index fac05bf8206..144a414dc15 100644
--- a/src/Compiler/SyntaxTree/ParseHelpers.fs
+++ b/src/Compiler/SyntaxTree/ParseHelpers.fs
@@ -616,7 +616,7 @@ let mkSynMemberDefnGetSet
                     // should be unreachable, cover just in case
                     raiseParseErrorAt mWholeBindLhs (FSComp.SR.parsInvalidProperty ())
 
-            let valSynData = SynValData(Some(memFlags), valSynInfo, None, None)
+            let valSynData = SynValData(Some(memFlags), valSynInfo, None)
 
             // Fold together the information from the first lambda pattern and the get/set binding
             // This uses the 'this' variable from the first and the patterns for the get/set binding,
diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fs b/src/Compiler/SyntaxTree/SyntaxTree.fs
index bfe0ef550d5..68e7a3f29d1 100644
--- a/src/Compiler/SyntaxTree/SyntaxTree.fs
+++ b/src/Compiler/SyntaxTree/SyntaxTree.fs
@@ -1046,11 +1046,7 @@ type SynAttributes = SynAttributeList list
 
 [<NoEquality; NoComparison>]
 type SynValData =
-    | SynValData of
-        memberFlags: SynMemberFlags option *
-        valInfo: SynValInfo *
-        thisIdOpt: Ident option *
-        transformedFromProperty: Ident option
+    | SynValData of memberFlags: SynMemberFlags option * valInfo: SynValInfo * thisIdOpt: Ident option
 
     member x.SynValInfo = (let (SynValData (valInfo = synValInfo)) = x in synValInfo)
 
diff --git a/src/Compiler/SyntaxTree/SyntaxTree.fsi b/src/Compiler/SyntaxTree/SyntaxTree.fsi
index d2eed167c46..6f8a86d14b7 100644
--- a/src/Compiler/SyntaxTree/SyntaxTree.fsi
+++ b/src/Compiler/SyntaxTree/SyntaxTree.fsi
@@ -1195,13 +1195,7 @@ type SynAttributes = SynAttributeList list
 /// Represents extra information about the declaration of a value
 [<NoEquality; NoComparison>]
 type SynValData =
-    | SynValData of
-        memberFlags: SynMemberFlags option *
-        valInfo: SynValInfo *
-        thisIdOpt: Ident option *
-        /// Is only populated during type-checking when an property has both a getter and setter.
-        /// It is used to track the fact that the getter and setter are part of the same property when they are desugared.
-        transformedFromProperty: Ident option
+    | SynValData of memberFlags: SynMemberFlags option * valInfo: SynValInfo * thisIdOpt: Ident option
 
     member SynValInfo: SynValInfo
 
diff --git a/src/Compiler/SyntaxTree/SyntaxTreeOps.fs b/src/Compiler/SyntaxTree/SyntaxTreeOps.fs
index 26f3f9e7ed5..3d569c6b4e8 100644
--- a/src/Compiler/SyntaxTree/SyntaxTreeOps.fs
+++ b/src/Compiler/SyntaxTree/SyntaxTreeOps.fs
@@ -663,7 +663,7 @@ module SynInfo =
 
     let private emptySynValInfo = SynValInfo([], unnamedRetVal)
 
-    let emptySynValData = SynValData(None, emptySynValInfo, None, None)
+    let emptySynValData = SynValData(None, emptySynValInfo, None)
 
     let emptySynArgInfo = SynArgInfo([], false, None)
 
@@ -693,7 +693,7 @@ module SynInfo =
                 @ (if explicitArgsAreSimple then infosForLambdaArgs else [])
 
             let infosForArgs = AdjustArgsForUnitElimination infosForArgs
-            SynValData(None, SynValInfo(infosForArgs, retInfo), None, None)
+            SynValData(None, SynValInfo(infosForArgs, retInfo), None)
 
         | Some memFlags ->
             let infosForObjArgs = if memFlags.IsInstance then [ selfMetadata ] else []
@@ -702,7 +702,7 @@ module SynInfo =
             let infosForArgs = AdjustArgsForUnitElimination infosForArgs
 
             let argInfos = infosForObjArgs @ infosForArgs
-            SynValData(Some memFlags, SynValInfo(argInfos, retInfo), None, None)
+            SynValData(Some memFlags, SynValInfo(argInfos, retInfo), None)
 
 let mkSynBindingRhs staticOptimizations rhsExpr mRhs retInfo =
     let rhsExpr =
@@ -727,13 +727,6 @@ let mkSynBinding
     let mBind = unionRangeWithXmlDoc xmlDoc mBind
     SynBinding(vis, SynBindingKind.Normal, isInline, isMutable, attrs, xmlDoc, info, headPat, retTyOpt, rhsExpr, mBind, spBind, trivia)
 
-let updatePropertyIdentInSynBinding
-    propertyIdent
-    (SynBinding (vis, kind, ii, im, attr, xmlDoc, SynValData (memberFlags, valInfo, thisIdOpt, _), p, ri, e, m, dp, t))
-    =
-    let valData = SynValData(memberFlags, valInfo, thisIdOpt, Some propertyIdent)
-    SynBinding(vis, kind, ii, im, attr, xmlDoc, valData, p, ri, e, m, dp, t)
-
 let NonVirtualMemberFlags k : SynMemberFlags =
     {
         MemberKind = k
@@ -1001,25 +994,17 @@ let rec desugarGetSetMembers (memberDefns: SynMemberDefns) =
     memberDefns
     |> List.collect (fun md ->
         match md with
-        | SynMemberDefn.GetSetMember (Some (SynBinding(headPat = SynPat.LongIdent (longDotId = lid)) as getBinding),
+        | SynMemberDefn.GetSetMember (Some (SynBinding _ as getBinding),
                                       Some (SynBinding _ as setBinding),
                                       m,
                                       {
                                           GetKeyword = Some mGet
                                           SetKeyword = Some mSet
                                       }) ->
-            let lastIdent = List.last lid.LongIdent
-
             if Position.posLt mGet.Start mSet.Start then
-                [
-                    SynMemberDefn.Member(updatePropertyIdentInSynBinding lastIdent getBinding, m)
-                    SynMemberDefn.Member(updatePropertyIdentInSynBinding lastIdent setBinding, m)
-                ]
+                [ SynMemberDefn.Member(getBinding, m); SynMemberDefn.Member(setBinding, m) ]
             else
-                [
-                    SynMemberDefn.Member(updatePropertyIdentInSynBinding lastIdent setBinding, m)
-                    SynMemberDefn.Member(updatePropertyIdentInSynBinding lastIdent getBinding, m)
-                ]
+                [ SynMemberDefn.Member(setBinding, m); SynMemberDefn.Member(getBinding, m) ]
         | SynMemberDefn.GetSetMember (Some binding, None, m, _)
         | SynMemberDefn.GetSetMember (None, Some binding, m, _) -> [ SynMemberDefn.Member(binding, m) ]
         | SynMemberDefn.Interface (interfaceType, withKeyword, members, m) ->
diff --git a/src/Compiler/SyntaxTree/SyntaxTreeOps.fsi b/src/Compiler/SyntaxTree/SyntaxTreeOps.fsi
index 337e9d135cd..03fc0be628d 100644
--- a/src/Compiler/SyntaxTree/SyntaxTreeOps.fsi
+++ b/src/Compiler/SyntaxTree/SyntaxTreeOps.fsi
@@ -292,8 +292,6 @@ val mkSynBinding:
         trivia: SynBindingTrivia ->
             SynBinding
 
-val updatePropertyIdentInSynBinding: propertyIdent: Ident -> SynBinding -> SynBinding
-
 val NonVirtualMemberFlags: k: SynMemberKind -> SynMemberFlags
 
 val CtorMemberFlags: SynMemberFlags
diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy
index 1e44ef874da..2532bd8558d 100644
--- a/src/Compiler/pars.fsy
+++ b/src/Compiler/pars.fsy
@@ -2074,7 +2074,7 @@ classDefnMember:
        let m = unionRanges mWholeBindLhs $7.Range |> unionRangeWithXmlDoc xmlDoc
        let mEquals = rhs parseState 6
        let expr = $7
-       let valSynData = SynValData (Some CtorMemberFlags, SynValInfo([SynInfo.InferSynArgInfoFromPat $4], SynInfo.unnamedRetVal), Option.bind snd $5, None)
+       let valSynData = SynValData (Some CtorMemberFlags, SynValInfo([SynInfo.InferSynArgInfoFromPat $4], SynInfo.unnamedRetVal), Option.bind snd $5)
        let vis = $2
        let declPat = SynPat.LongIdent(SynLongIdent([mkSynId (rhs parseState 3) "new"], [], [None]), None, Some noInferredTypars, SynArgPats.Pats [$4], vis, rhs parseState 3)
        // Check that 'SynPatForConstructorDecl' matches this correctly
@@ -2090,7 +2090,7 @@ classDefnMember:
        let xmlDoc = grabXmlDoc (parseState, $1, 1)
        let m = unionRanges (rhs parseState 1) mEnd |> unionRangeWithXmlDoc xmlDoc
        let expr = arbExpr ("new1", mEnd.EndRange)
-       let valSynData = SynValData (Some CtorMemberFlags, SynValInfo([SynInfo.InferSynArgInfoFromPat $4], SynInfo.unnamedRetVal), Option.bind snd $5, None)
+       let valSynData = SynValData (Some CtorMemberFlags, SynValInfo([SynInfo.InferSynArgInfoFromPat $4], SynInfo.unnamedRetVal), Option.bind snd $5)
        let declPat = SynPat.LongIdent(SynLongIdent([mkSynId (rhs parseState 3) "new"], [], [None]), None, Some noInferredTypars, SynArgPats.Pats [$4], $2, rhs parseState 3)
        assert (match declPat with SynPatForConstructorDecl _ -> true | _ -> false)
        let synBindingTrivia: SynBindingTrivia = { LeadingKeyword = SynLeadingKeyword.New mNew; InlineKeyword = None; EqualsRange = None }
@@ -2104,7 +2104,7 @@ classDefnMember:
        let xmlDoc = grabXmlDoc (parseState, $1, 1)
        let m = unionRanges (rhs parseState 1) mEnd |> unionRangeWithXmlDoc xmlDoc
        let expr = arbExpr ("new2", mEnd.EndRange)
-       let valSynData = SynValData(Some CtorMemberFlags, SynValInfo([SynInfo.InferSynArgInfoFromPat $4], SynInfo.unnamedRetVal), Option.bind snd $5, None)
+       let valSynData = SynValData(Some CtorMemberFlags, SynValInfo([SynInfo.InferSynArgInfoFromPat $4], SynInfo.unnamedRetVal), Option.bind snd $5)
        let declPat = SynPat.LongIdent(SynLongIdent([mkSynId (rhs parseState 3) "new"], [], [None]), None, Some noInferredTypars, SynArgPats.Pats [$4], $2, rhs parseState 3)
        assert (match declPat with SynPatForConstructorDecl _ -> true | _ -> false)
        let synBindingTrivia: SynBindingTrivia = { LeadingKeyword = SynLeadingKeyword.New mNew; InlineKeyword = None; EqualsRange = None }
@@ -2116,7 +2116,7 @@ classDefnMember:
        let xmlDoc = grabXmlDoc (parseState, $1, 1)
        let pat = patFromParseError (SynPat.Wild(mNew.EndRange))
        let expr = arbExpr ("new3", mNew.EndRange)
-       let valSynData = SynValData(Some CtorMemberFlags, SynValInfo([SynInfo.InferSynArgInfoFromPat pat], SynInfo.unnamedRetVal), None, None)
+       let valSynData = SynValData(Some CtorMemberFlags, SynValInfo([SynInfo.InferSynArgInfoFromPat pat], SynInfo.unnamedRetVal), None)
        let vis = $2
        let declPat = SynPat.LongIdent(SynLongIdent([mkSynId (rhs parseState 3) "new"], [], [None]), None, Some noInferredTypars, SynArgPats.Pats [pat], vis, rhs parseState 3)
        let synBindingTrivia: SynBindingTrivia = { LeadingKeyword = SynLeadingKeyword.New mNew; InlineKeyword = None; EqualsRange = None }
diff --git a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs
index d4e8d302dd9..a71f63cbfb9 100644
--- a/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs
+++ b/tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MemberDefinitions/MethodsAndProperties/MethodsAndProperties.fs
@@ -592,7 +592,7 @@ type MyIndexerClass() =
         |> withLangVersionPreview
         |> typecheck
         |> shouldFail
-        |> withSingleDiagnostic (Warning 3581, Line 4, Col 14, Line 4, Col 17, "An indexed property's getter and setter must have the same type. Property 'Indexer1' has getter of type 'string' but setter of type 'float'.")
+        |> withSingleDiagnostic (Warning 3581, Line 3, Col 14, Line 3, Col 22, "An indexed property's getter and setter must have the same type. Property 'Indexer1' has getter of type 'string' but setter of type 'float'.")
         
     [<Fact>]
     let ``Indexed2PropertiesSameType_fs preview``() =
@@ -605,7 +605,7 @@ type MyIndexerClass() =
         |> withLangVersionPreview
         |> typecheck
         |> shouldFail
-        |> withSingleDiagnostic (Warning 3581, Line 4, Col 14, Line 4, Col 17, "An indexed property's getter and setter must have the same type. Property 'Indexer2' has getter of type 'int' but setter of type 'float'.")
+        |> withSingleDiagnostic (Warning 3581, Line 3, Col 14, Line 3, Col 22, "An indexed property's getter and setter must have the same type. Property 'Indexer2' has getter of type 'int' but setter of type 'float'.")
     
     [<Fact>]
     let ``Indexed3PropertiesSameType_fs preview``() =
@@ -632,7 +632,7 @@ type MyIndexerClass() =
         |> withLangVersionPreview
         |> typecheck
         |> shouldFail
-        |> withSingleDiagnostic (Warning 3581, Line 4, Col 14, Line 4, Col 17, "An indexed property's getter and setter must have the same type. Property 'Indexer4' has getter of type 'float' but setter of type 'string'.")
+        |> withSingleDiagnostic (Warning 3581, Line 3, Col 14, Line 3, Col 22, "An indexed property's getter and setter must have the same type. Property 'Indexer4' has getter of type 'float' but setter of type 'string'.")
         
     [<Fact>]
     let ``Indexed5PropertiesSameType_fs preview``() =
@@ -645,7 +645,7 @@ type MyIndexerClass() =
         |> withLangVersionPreview
         |> typecheck
         |> shouldFail
-        |> withSingleDiagnostic (Warning 3581, Line 4, Col 14, Line 4, Col 17, "An indexed property's getter and setter must have the same type. Property 'Indexer5' has getter of type 'float' but setter of type 'obj'.")
+        |> withSingleDiagnostic (Warning 3581, Line 3, Col 14, Line 3, Col 22, "An indexed property's getter and setter must have the same type. Property 'Indexer5' has getter of type 'float' but setter of type 'obj'.")
             
     [<Fact>]
     let ``GenericIndexerPropertiesSameType_fs preview``() =
@@ -667,4 +667,4 @@ type GenericIndexer<'indexerArgs,'indexerOutput,'indexerInput>() =
         |> withLangVersionPreview
         |> typecheck
         |> shouldFail
-        |> withSingleDiagnostic (Warning 3581, Line 9, Col 27, Line 9, Col 30, "An indexed property's getter and setter must have the same type. Property 'Item' has getter of type ''indexerOutput' but setter of type ''indexerInput'.")
\ No newline at end of file
+        |> withSingleDiagnostic (Warning 3581, Line 9, Col 17, Line 9, Col 21, "An indexed property's getter and setter must have the same type. Property 'Item' has getter of type ''indexerOutput' but setter of type ''indexerInput'.")
\ No newline at end of file
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 35a2f057608..5ac7347ed49 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
@@ -9285,7 +9285,7 @@ FSharp.Compiler.Syntax.SynUnionCaseKind: FSharp.Compiler.Syntax.SynUnionCaseKind
 FSharp.Compiler.Syntax.SynUnionCaseKind: Int32 Tag
 FSharp.Compiler.Syntax.SynUnionCaseKind: Int32 get_Tag()
 FSharp.Compiler.Syntax.SynUnionCaseKind: System.String ToString()
-FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValData NewSynValData(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynMemberFlags], FSharp.Compiler.Syntax.SynValInfo, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident])
+FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValData NewSynValData(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynMemberFlags], FSharp.Compiler.Syntax.SynValInfo, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident])
 FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValInfo SynValInfo
 FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValInfo get_SynValInfo()
 FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValInfo get_valInfo()
@@ -9293,9 +9293,7 @@ FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValInfo valInfo
 FSharp.Compiler.Syntax.SynValData: Int32 Tag
 FSharp.Compiler.Syntax.SynValData: Int32 get_Tag()
 FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] get_thisIdOpt()
-FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] get_transformedFromProperty()
 FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] thisIdOpt
-FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] transformedFromProperty
 FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynMemberFlags] get_memberFlags()
 FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynMemberFlags] memberFlags
 FSharp.Compiler.Syntax.SynValData: System.String ToString()
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 35a2f057608..5ac7347ed49 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
@@ -9285,7 +9285,7 @@ FSharp.Compiler.Syntax.SynUnionCaseKind: FSharp.Compiler.Syntax.SynUnionCaseKind
 FSharp.Compiler.Syntax.SynUnionCaseKind: Int32 Tag
 FSharp.Compiler.Syntax.SynUnionCaseKind: Int32 get_Tag()
 FSharp.Compiler.Syntax.SynUnionCaseKind: System.String ToString()
-FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValData NewSynValData(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynMemberFlags], FSharp.Compiler.Syntax.SynValInfo, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident], Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident])
+FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValData NewSynValData(Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynMemberFlags], FSharp.Compiler.Syntax.SynValInfo, Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident])
 FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValInfo SynValInfo
 FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValInfo get_SynValInfo()
 FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValInfo get_valInfo()
@@ -9293,9 +9293,7 @@ FSharp.Compiler.Syntax.SynValData: FSharp.Compiler.Syntax.SynValInfo valInfo
 FSharp.Compiler.Syntax.SynValData: Int32 Tag
 FSharp.Compiler.Syntax.SynValData: Int32 get_Tag()
 FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] get_thisIdOpt()
-FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] get_transformedFromProperty()
 FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] thisIdOpt
-FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.Ident] transformedFromProperty
 FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynMemberFlags] get_memberFlags()
 FSharp.Compiler.Syntax.SynValData: Microsoft.FSharp.Core.FSharpOption`1[FSharp.Compiler.Syntax.SynMemberFlags] memberFlags
 FSharp.Compiler.Syntax.SynValData: System.String ToString()
diff --git a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/AutoProperties/E_PrivateProperty01.fs b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/AutoProperties/E_PrivateProperty01.fs
index 8623318815d..acb21f79b71 100644
--- a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/AutoProperties/E_PrivateProperty01.fs
+++ b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/AutoProperties/E_PrivateProperty01.fs
@@ -1,5 +1,5 @@
 // #Conformance #ObjectOrientedTypes #Classes #MethodsAndProperties #Accessibility
-//<Expects status="error" span="(6,49-6,52)" id="FS0410">The type 'X' is less accessible than the value, member or type 'member XX\.PublicProperty: X' it is used in.$</Expects>
+//<Expects status="error" span="(6,23-6,37)" id="FS0410">The type 'X' is less accessible than the value, member or type 'member XX\.PublicProperty: X' it is used in.$</Expects>
 type private X() = class end
 
 type XX() =
diff --git a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_PropertyInvalidGetterSetter01.fs b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_PropertyInvalidGetterSetter01.fs
index 94093a22e50..8679d30a42c 100644
--- a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_PropertyInvalidGetterSetter01.fs
+++ b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_PropertyInvalidGetterSetter01.fs
@@ -1,6 +1,6 @@
 // #Regression #Conformance #ObjectOrientedTypes #Classes #MethodsAndProperties #MemberDefinitions 
 // Regression test for 342901
-//<Expects id="FS3172" span="(7,14-7,17)" status="error">A property's getter and setter must have the same type\. Property 'X' has getter of type 'obj option' but setter of type 'obj'\.</Expects>
+//<Expects id="FS3172" span="(6,17-6,18)" status="error">A property's getter and setter must have the same type\. Property 'X' has getter of type 'obj option' but setter of type 'obj'\.</Expects>
 type Foo(x) =
     let mutable x = x
     member this.X 
diff --git a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_PropertySetterUnit01.fs b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_PropertySetterUnit01.fs
index 2023bb37c63..bdc20b5b1f4 100644
--- a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_PropertySetterUnit01.fs
+++ b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_PropertySetterUnit01.fs
@@ -4,8 +4,8 @@
 // See also bug #5456
 // Since Dev11, A property's getter and setter must have the same type, so error would be reported.
 // See bug #342901
-//<Expects id="FS3172" span="(13,21-13,24)" status="error">A property's getter and setter must have the same type\. Property 'ini' has getter of type 'bool' but setter of type 'unit'\.</Expects>
-//<Expects id="FS3172" span="(20,21-20,24)" status="error">A property's getter and setter must have the same type\. Property 'ini' has getter of type 'bool' but setter of type 'unit'\.</Expects>
+//<Expects id="FS3172" span="(12,27-12,30)" status="error">A property's getter and setter must have the same type\. Property 'ini' has getter of type 'bool' but setter of type 'unit'\.</Expects>
+//<Expects id="FS3172" span="(19,27-19,30)" status="error">A property's getter and setter must have the same type\. Property 'ini' has getter of type 'bool' but setter of type 'unit'\.</Expects>
 module M
 type test = class
               val mutable Init : bool
diff --git a/tests/service/ProjectAnalysisTests.fs b/tests/service/ProjectAnalysisTests.fs
index 98ab29039c3..bd0262103e5 100644
--- a/tests/service/ProjectAnalysisTests.fs
+++ b/tests/service/ProjectAnalysisTests.fs
@@ -3440,41 +3440,40 @@ let ``Test Project24 all symbols`` () =
     allUses |> shouldEqual
           [|("TypeWithProperties", "file1", ((4, 5), (4, 23)), ["defn"], ["class"]);
             ("``.ctor``", "file1", ((4, 5), (4, 23)), ["defn"], ["member"; "ctor"]);
-            ("NameGetSet", "file1", ((6, 13), (6, 16)), ["defn"], ["member"; "getter"]);
+            ("NameGetSet", "file1", ((5, 13), (5, 23)), ["defn"], ["member"; "getter"]);
             ("int", "file1", ((7, 20), (7, 23)), ["type"], ["abbrev"]);
-            ("NameGetSet", "file1", ((7, 12), (7, 15)), ["defn"], ["member"; "setter"]);
-            ("NameGet", "file1", ((10, 13), (10, 16)), ["defn"], ["member"; "getter"]);
+            ("NameGetSet", "file1", ((5, 13), (5, 23)), ["defn"], ["member"; "setter"]);
+            ("NameGet", "file1", ((9, 13), (9, 20)), ["defn"], ["member"; "getter"]);
             ("int", "file1", ((11, 20), (11, 23)), ["type"], ["abbrev"]);
-            ("NameGet", "file1", ((11, 12), (11, 15)), ["defn"], ["member"; "setter"]);
+            ("NameGet", "file1", ((9, 13), (9, 20)), ["defn"], ["member"; "setter"]);
             ("int", "file1", ((14, 21), (14, 24)), ["type"], ["abbrev"]);
             ("NameSet", "file1", ((13, 13), (13, 20)), ["defn"], ["member"; "setter"]);
             ("StaticNameGetSet", "file1", ((16, 18), (16, 34)), ["defn"],
              ["member"; "getter"]);
-            ("int", "file1", ((18, 20), (18, 23)), ["type"], ["abbrev"])
+            ("int", "file1", ((18, 20), (18, 23)), ["type"], ["abbrev"]);
             ("StaticNameGetSet", "file1", ((16, 18), (16, 34)), ["defn"], ["member"; "setter"]);
             ("StaticNameGet", "file1", ((20, 18), (20, 31)), ["defn"],
              ["member"; "getter"]);
-            ("int", "file1", ((22, 20), (22, 23)), ["type"], ["abbrev"])
+            ("int", "file1", ((22, 20), (22, 23)), ["type"], ["abbrev"]);
             ("StaticNameGet", "file1", ((20, 18), (20, 31)), ["defn"], ["member"; "setter"]);
             ("int", "file1", ((25, 21), (25, 24)), ["type"], ["abbrev"]);
             ("StaticNameSet", "file1", ((24, 18), (24, 31)), ["defn"],
              ["member"; "setter"]);
-            ("AutoPropGet", "file1", ((27, 15), (27, 26)), ["defn"],
+            ("AutoPropGet", "file1", ((27, 15), (27, 26)), ["defn"], ["member"; "getter"]);
+            ("AutoPropGetSet", "file1", ((28, 15), (28, 29)), ["defn"],
              ["member"; "getter"]);
-            ("AutoPropGetSet", "file1", ((28, 39), (28, 42)), ["defn"],
-             ["member"; "getter"]);
-            ("AutoPropGetSet", "file1", ((28, 44), (28, 47)), ["defn"], ["member"; "setter"])
+            ("AutoPropGetSet", "file1", ((28, 15), (28, 29)), ["defn"], ["member"; "setter"]);
             ("StaticAutoPropGet", "file1", ((30, 22), (30, 39)), ["defn"],
              ["member"; "getter"]);
-            ("StaticAutoPropGetSet", "file1", ((31, 52), (31, 55)), ["defn"],
-             ["member"; "getter"])
-            ("StaticAutoPropGetSet", "file1", ((31, 57), (31, 60)), ["defn"], ["member"; "setter"])
+            ("StaticAutoPropGetSet", "file1", ((31, 22), (31, 42)), ["defn"],
+             ["member"; "getter"]);
+            ("StaticAutoPropGetSet", "file1", ((31, 22), (31, 42)), ["defn"], ["member"; "setter"]);
             ("NameGetSet", "file1", ((5, 13), (5, 23)), ["defn"], ["member"; "prop"]);
-            ("NameGet", "file1", ((9, 13), (9, 20)), ["defn"], ["member"; "prop"])
+            ("NameGet", "file1", ((9, 13), (9, 20)), ["defn"], ["member"; "prop"]);
             ("StaticNameGetSet", "file1", ((16, 18), (16, 34)), ["defn"], ["member"; "prop"]);
             ("StaticNameGet", "file1", ((20, 18), (20, 31)), ["defn"], ["member"; "prop"]);
-            ("AutoPropGetSet", "file1", ((28, 15), (28, 29)), ["defn"], ["member"; "prop"])
-            ("StaticAutoPropGetSet", "file1", ((31, 22), (31, 42)), ["defn"], ["member"; "prop"]);
+            ("AutoPropGetSet", "file1", ((28, 15), (28, 29)), ["defn"], ["member"; "prop"]);
+            ("StaticAutoPropGetSet", "file1", ((31, 22), (31, 42)), ["defn"], ["member"; "prop"])
             ("x", "file1", ((5, 11), (5, 12)), ["defn"], []);
             ("int", "file1", ((7, 20), (7, 23)), ["type"], ["abbrev"]);
             ("v", "file1", ((7, 17), (7, 18)), ["defn"], []);
@@ -3491,25 +3490,21 @@ let ``Test Project24 all symbols`` () =
             ("int", "file1", ((25, 21), (25, 24)), ["type"], ["abbrev"]);
             ("v", "file1", ((25, 18), (25, 19)), ["defn"], []);
             ("``AutoPropGet@``", "file1", ((27, 15), (27, 26)), [], ["compgen"]);
-            ("``AutoPropGetSet@``", "file1", ((28, 15), (28, 29)), [], ["compgen";"mutable"]);
-            ("v", "file1", ((28, 44), (28, 47)), ["defn"], []);
+            ("``AutoPropGetSet@``", "file1", ((28, 15), (28, 29)), [], ["compgen"; "mutable"])
+            ("v", "file1", ((28, 15), (28, 29)), ["defn"], []);
             ("``StaticAutoPropGet@``", "file1", ((30, 22), (30, 39)), [], ["compgen"]);
             ("``StaticAutoPropGetSet@``", "file1", ((31, 22), (31, 42)), [],
-             ["compgen";"mutable"]); ("v", "file1", ((31, 57), (31, 60)), ["defn"], []);
+             ["compgen"; "mutable"]); ("v", "file1", ((31, 22), (31, 42)), ["defn"], []);
             ("``.cctor``", "file1", ((4, 5), (4, 23)), ["defn"], ["member"]);
-            ("TypeWithProperties", "file1", ((33, 9), (33, 27)), [],
-             ["member"; "ctor"]);
+            ("TypeWithProperties", "file1", ((33, 9), (33, 27)), [], ["member"; "ctor"]);
             ("NameGetSet", "file1", ((33, 9), (33, 40)), [], ["member"; "prop"]);
             ("v1", "file1", ((33, 4), (33, 6)), ["defn"], ["val"]);
-            ("TypeWithProperties", "file1", ((34, 0), (34, 18)), [],
-             ["member"; "ctor"]);
+            ("TypeWithProperties", "file1", ((34, 0), (34, 18)), [], ["member"; "ctor"]);
             ("NameGetSet", "file1", ((34, 0), (34, 31)), [], ["member"; "prop"]);
-            ("TypeWithProperties", "file1", ((36, 9), (36, 27)), [],
-             ["member"; "ctor"]);
+            ("TypeWithProperties", "file1", ((36, 9), (36, 27)), [], ["member"; "ctor"]);
             ("NameGet", "file1", ((36, 9), (36, 37)), [], ["member"; "prop"]);
             ("v2", "file1", ((36, 4), (36, 6)), ["defn"], ["val"]);
-            ("TypeWithProperties", "file1", ((38, 0), (38, 18)), [],
-             ["member"; "ctor"]);
+            ("TypeWithProperties", "file1", ((38, 0), (38, 18)), [], ["member"; "ctor"]);
             ("NameSet", "file1", ((38, 0), (38, 28)), [], ["member"; "prop"]);
             ("TypeWithProperties", "file1", ((40, 9), (40, 27)), [], ["class"]);
             ("StaticNameGetSet", "file1", ((40, 9), (40, 44)), [], ["member"; "prop"]);
@@ -3521,27 +3516,22 @@ let ``Test Project24 all symbols`` () =
             ("v4", "file1", ((43, 4), (43, 6)), ["defn"], ["val"]);
             ("TypeWithProperties", "file1", ((45, 0), (45, 18)), [], ["class"]);
             ("StaticNameSet", "file1", ((45, 0), (45, 32)), [], ["member"; "prop"]);
-            ("TypeWithProperties", "file1", ((47, 9), (47, 27)), [],
-             ["member"; "ctor"]);
+            ("TypeWithProperties", "file1", ((47, 9), (47, 27)), [], ["member"; "ctor"]);
             ("AutoPropGet", "file1", ((47, 9), (47, 41)), [], ["member"; "prop"]);
             ("v5", "file1", ((47, 4), (47, 6)), ["defn"], ["val"]);
-            ("TypeWithProperties", "file1", ((49, 9), (49, 27)), [],
-             ["member"; "ctor"]);
+            ("TypeWithProperties", "file1", ((49, 9), (49, 27)), [], ["member"; "ctor"]);
             ("AutoPropGetSet", "file1", ((49, 9), (49, 44)), [], ["member"; "prop"]);
             ("v6", "file1", ((49, 4), (49, 6)), ["defn"], ["val"]);
-            ("TypeWithProperties", "file1", ((50, 0), (50, 18)), [],
-             ["member"; "ctor"]);
+            ("TypeWithProperties", "file1", ((50, 0), (50, 18)), [], ["member"; "ctor"]);
             ("AutoPropGetSet", "file1", ((50, 0), (50, 35)), [], ["member"; "prop"]);
             ("TypeWithProperties", "file1", ((52, 9), (52, 27)), [], ["class"]);
             ("StaticAutoPropGet", "file1", ((52, 9), (52, 45)), [], ["member"; "prop"]);
             ("v7", "file1", ((52, 4), (52, 6)), ["defn"], ["val"]);
             ("TypeWithProperties", "file1", ((54, 9), (54, 27)), [], ["class"]);
-            ("StaticAutoPropGetSet", "file1", ((54, 9), (54, 48)), [],
-             ["member"; "prop"]);
+            ("StaticAutoPropGetSet", "file1", ((54, 9), (54, 48)), [], ["member"; "prop"]);
             ("v8", "file1", ((54, 4), (54, 6)), ["defn"], ["val"]);
             ("TypeWithProperties", "file1", ((55, 0), (55, 18)), [], ["class"]);
-            ("StaticAutoPropGetSet", "file1", ((55, 0), (55, 39)), [],
-             ["member"; "prop"]);
+            ("StaticAutoPropGetSet", "file1", ((55, 0), (55, 39)), [], ["member"; "prop"]);
             ("PropertyTest", "file1", ((2, 7), (2, 19)), ["defn"], ["module"])|]
 
 [<Test>]
@@ -3559,39 +3549,37 @@ let ``Test symbol uses of properties with both getters and setters`` () =
     getAllSymbolUses |> shouldEqual
           [|("TypeWithProperties", "file1", ((4, 5), (4, 23)), ["class"]);
             ("``.ctor``", "file1", ((4, 5), (4, 23)), ["member"; "ctor"]);
-            ("NameGetSet", "file1", ((6, 13), (6, 16)), ["member"; "getter"]);
-            ("int", "file1", ((7, 20), (7, 23)), ["abbrev"])
-            ("NameGetSet", "file1", ((7, 12), (7, 15)), ["member"; "setter"]);
-            ("NameGet", "file1", ((10, 13), (10, 16)), ["member"; "getter"]);
-            ("int", "file1", ((11, 20), (11, 23)), ["abbrev"])
-            ("NameGet", "file1", ((11, 12), (11, 15)), ["member"; "setter"]);
+            ("NameGetSet", "file1", ((5, 13), (5, 23)), ["member"; "getter"]);
+            ("int", "file1", ((7, 20), (7, 23)), ["abbrev"]);
+            ("NameGetSet", "file1", ((5, 13), (5, 23)), ["member"; "setter"]);
+            ("NameGet", "file1", ((9, 13), (9, 20)), ["member"; "getter"]);
+            ("int", "file1", ((11, 20), (11, 23)), ["abbrev"]);
+            ("NameGet", "file1", ((9, 13), (9, 20)), ["member"; "setter"]);
             ("int", "file1", ((14, 21), (14, 24)), ["abbrev"]);
             ("NameSet", "file1", ((13, 13), (13, 20)), ["member"; "setter"]);
             ("StaticNameGetSet", "file1", ((16, 18), (16, 34)), ["member"; "getter"]);
-            ("int", "file1", ((18, 20), (18, 23)), ["abbrev"])
+            ("int", "file1", ((18, 20), (18, 23)), ["abbrev"]);
             ("StaticNameGetSet", "file1", ((16, 18), (16, 34)), ["member"; "setter"]);
             ("StaticNameGet", "file1", ((20, 18), (20, 31)), ["member"; "getter"]);
-            ("int", "file1", ((22, 20), (22, 23)), ["abbrev"])
+            ("int", "file1", ((22, 20), (22, 23)), ["abbrev"]);
             ("StaticNameGet", "file1", ((20, 18), (20, 31)), ["member"; "setter"]);
             ("int", "file1", ((25, 21), (25, 24)), ["abbrev"]);
             ("StaticNameSet", "file1", ((24, 18), (24, 31)), ["member"; "setter"]);
             ("AutoPropGet", "file1", ((27, 15), (27, 26)), ["member"; "getter"]);
-            ("AutoPropGetSet", "file1", ((28, 39), (28, 42)), ["member"; "getter"])
-            ("AutoPropGetSet", "file1", ((28, 44), (28, 47)), ["member"; "setter"]);
+            ("AutoPropGetSet", "file1", ((28, 15), (28, 29)), ["member"; "getter"]);
+            ("AutoPropGetSet", "file1", ((28, 15), (28, 29)), ["member"; "setter"]);
             ("StaticAutoPropGet", "file1", ((30, 22), (30, 39)), ["member"; "getter"]);
-            ("StaticAutoPropGetSet", "file1", ((31, 52), (31, 55)),
-             ["member"; "getter"])
-            ("StaticAutoPropGetSet", "file1", ((31, 57), (31, 60)), ["member"; "setter"])
-            ("NameGetSet", "file1", ((5, 13), (5, 23)), ["member"; "prop"])
-            ("NameGet", "file1", ((9, 13), (9, 20)), ["member"; "prop"])
-            ("StaticNameGetSet", "file1", ((16, 18), (16, 34)), ["member"; "prop"])
-            ("StaticNameGet", "file1", ((20, 18), (20, 31)), ["member"; "prop"])
-            ("AutoPropGetSet", "file1", ((28, 15), (28, 29)), ["member"; "prop"])
-            ("StaticAutoPropGetSet", "file1", ((31, 22), (31, 42)), ["member"; "prop"])
+            ("StaticAutoPropGetSet", "file1", ((31, 22), (31, 42)), ["member"; "getter"]);
+            ("StaticAutoPropGetSet", "file1", ((31, 22), (31, 42)), ["member"; "setter"]);
+            ("NameGetSet", "file1", ((5, 13), (5, 23)), ["member"; "prop"]);
+            ("NameGet", "file1", ((9, 13), (9, 20)), ["member"; "prop"]);
+            ("StaticNameGetSet", "file1", ((16, 18), (16, 34)), ["member"; "prop"]);
+            ("StaticNameGet", "file1", ((20, 18), (20, 31)), ["member"; "prop"]);
+            ("AutoPropGetSet", "file1", ((28, 15), (28, 29)), ["member"; "prop"]);
+            ("StaticAutoPropGetSet", "file1", ((31, 22), (31, 42)), ["member"; "prop"]);
             ("x", "file1", ((5, 11), (5, 12)), []);
             ("int", "file1", ((7, 20), (7, 23)), ["abbrev"]);
-            ("v", "file1", ((7, 17), (7, 18)), []);
-            ("x", "file1", ((9, 11), (9, 12)), []);
+            ("v", "file1", ((7, 17), (7, 18)), []); ("x", "file1", ((9, 11), (9, 12)), []);
             ("int", "file1", ((11, 20), (11, 23)), ["abbrev"]);
             ("v", "file1", ((11, 17), (11, 18)), []);
             ("x", "file1", ((13, 11), (13, 12)), []);
@@ -3604,11 +3592,11 @@ let ``Test symbol uses of properties with both getters and setters`` () =
             ("int", "file1", ((25, 21), (25, 24)), ["abbrev"]);
             ("v", "file1", ((25, 18), (25, 19)), []);
             ("``AutoPropGet@``", "file1", ((27, 15), (27, 26)), ["compgen"]);
-            ("``AutoPropGetSet@``", "file1", ((28, 15), (28, 29)), ["compgen";"mutable"]);
-            ("v", "file1", ((28, 44), (28, 47)), []);
+            ("``AutoPropGetSet@``", "file1", ((28, 15), (28, 29)), ["compgen"; "mutable"]);
+            ("v", "file1", ((28, 15), (28, 29)), []);
             ("``StaticAutoPropGet@``", "file1", ((30, 22), (30, 39)), ["compgen"]);
-            ("``StaticAutoPropGetSet@``", "file1", ((31, 22), (31, 42)), ["compgen";"mutable"]);
-            ("v", "file1", ((31, 57), (31, 60)), []);
+            ("``StaticAutoPropGetSet@``", "file1", ((31, 22), (31, 42)),
+             ["compgen"; "mutable"]); ("v", "file1", ((31, 22), (31, 42)), []);
             ("``.cctor``", "file1", ((4, 5), (4, 23)), ["member"]);
             ("TypeWithProperties", "file1", ((33, 9), (33, 27)), ["member"; "ctor"]);
             ("NameGetSet", "file1", ((33, 9), (33, 40)), ["member"; "prop"]);
@@ -3658,7 +3646,7 @@ let ``Test symbol uses of properties with both getters and setters`` () =
 
         |> Array.map (fun s -> (Project24.cleanFileName s.FileName, tups s.Range))
 
-    usesOfGetSampleSymbol |> shouldEqual [|("file1", ((10, 13), (10, 16))); ("file1", ((9, 13), (9, 20))); ("file1", ((36, 9), (36, 37)))|]
+    usesOfGetSampleSymbol |> shouldEqual [|("file1", ((9, 13), (9, 20))); ("file1", ((36, 9), (36, 37)))|]
 
 #if NO_CHECK_USE_OF_FSHARP_DATA_DLL
 #endif
diff --git a/tests/service/Symbols.fs b/tests/service/Symbols.fs
index bd8f138ef48..f4c417c909d 100644
--- a/tests/service/Symbols.fs
+++ b/tests/service/Symbols.fs
@@ -430,6 +430,14 @@ let f2 b1 b2 b3 b4 b5 =
             | _ -> ()
 
 module FSharpMemberOrFunctionOrValue =
+    let private chooseMemberOrFunctionOrValue (su: FSharpSymbolUse) =
+        match su.Symbol with :? FSharpMemberOrFunctionOrValue as mfv -> Some mfv | _ -> None
+
+    let private pickPropertySymbol (su: FSharpSymbolUse) =
+        match su.Symbol with
+        | :? FSharpMemberOrFunctionOrValue as mfv when mfv.IsProperty -> Some (mfv, su.Range)
+        | _ -> None
+    
     [<Test>]
     let ``Both Set and Get symbols are present`` () =
         let _, checkResults = getParseAndCheckResults """
@@ -441,16 +449,13 @@ type Foo =
             and set (a: int) (b: float) = ()
 """
 
-        // "X" resolves a symbol but it will either be the get or set symbol.
+        // "X" resolves a symbol but it will either be the property, get or set symbol.
         // Use get_ or set_ to differentiate.
-        let xSymbol = checkResults.GetSymbolUsesAtLocation(5, 14, "    member _.X", [ "X" ]) |> List.exactlyOne
-        
-        match xSymbol.Symbol with
-        | :? FSharpMemberOrFunctionOrValue as mfv ->
-            Assert.True mfv.IsProperty
-            Assert.True mfv.HasGetterMethod
-            Assert.True mfv.HasSetterMethod
-        | symbol-> Assert.Fail $"Expected {symbol} to be FSharpMemberOrFunctionOrValue"
+        let xPropertySymbol, _ = checkResults.GetSymbolUsesAtLocation(5, 14, "    member _.X", [ "X" ]) |> List.pick pickPropertySymbol
+
+        Assert.True xPropertySymbol.IsProperty
+        Assert.True xPropertySymbol.HasGetterMethod
+        Assert.True xPropertySymbol.HasSetterMethod
 
         let getSymbol = findSymbolUseByName "get_X" checkResults
         match getSymbol.Symbol with
@@ -465,7 +470,7 @@ type Foo =
         | symbol -> Assert.Fail $"Expected {symbol} to be FSharpMemberOrFunctionOrValue"
 
     [<Test>]
-    let ``AutoProperty with get,set has a single symbol!`` () =
+    let ``AutoProperty with get,set has property symbol!`` () =
         let _, checkResults = getParseAndCheckResults """
 namespace Foo
 
@@ -473,59 +478,56 @@ type Foo =
     member val AutoPropGetSet = 0 with get, set
 """
 
-        let autoPropertySymbolUse =
-            checkResults.GetSymbolUsesAtLocation(5, 29, "    member val AutoPropGetSet = 0 with get, set", ["AutoPropGetSet"])
-            |> List.exactlyOne
-       
-        match autoPropertySymbolUse.Symbol with
-        | :? FSharpMemberOrFunctionOrValue as mfv ->
-            Assert.True mfv.IsProperty
-            Assert.True mfv.HasGetterMethod
-            Assert.True mfv.HasSetterMethod
-            Assert.True (mfv.GetterMethod.CompiledName.StartsWith("get_"))
-            Assert.True (mfv.SetterMethod.CompiledName.StartsWith("set_"))
-            assertRange (5, 15) (5, 29) autoPropertySymbolUse.Range
+        let symbols = checkResults.GetSymbolUsesAtLocation(5, 29, "    member val AutoPropGetSet = 0 with get, set", ["AutoPropGetSet"])
 
-        | _ -> Assert.Fail "Symbol was not FSharpMemberOrFunctionOrValue"
+        let autoPropertySymbol, mAutoPropSymbolUse =
+            symbols
+            |> List.pick pickPropertySymbol
 
-        let getSymbol =
-            checkResults.GetSymbolUsesAtLocation(5, 42, "    member val AutoPropGetSet = 0 with get, set", ["get"])
-            |> List.map (fun su -> su.Symbol)
-            |> List.exactlyOne
-
-        // Two symbols for the setter: the set function and the compiler generated v parameter
-        let setSymbols =
-            checkResults.GetSymbolUsesAtLocation(5, 47, "    member val AutoPropGetSet = 0 with get, set", ["set"])
-            |> List.map (fun su -> su.Symbol)
+        Assert.True autoPropertySymbol.IsProperty
+        Assert.True autoPropertySymbol.HasGetterMethod
+        Assert.True autoPropertySymbol.HasSetterMethod
+        Assert.True (autoPropertySymbol.GetterMethod.CompiledName.StartsWith("get_"))
+        Assert.True (autoPropertySymbol.SetterMethod.CompiledName.StartsWith("set_"))
+        assertRange (5, 15) (5, 29) mAutoPropSymbolUse
 
-        match getSymbol, setSymbols with
-        | :? FSharpMemberOrFunctionOrValue as getMfv,
-          [ :? FSharpMemberOrFunctionOrValue as setVMfv 
-            :? FSharpMemberOrFunctionOrValue as setMfv ] ->
+        let symbols =
+            symbols
+            |> List.choose chooseMemberOrFunctionOrValue
+            
+        match symbols with
+        | [ propMfv
+            setMfv
+            getMfv ] ->
+            Assert.True propMfv.IsProperty
             Assert.True(getMfv.CompiledName.StartsWith("get_"))
-            Assert.AreEqual("v", setVMfv.DisplayName)
             Assert.True(setMfv.CompiledName.StartsWith("set_"))
-        | _ -> Assert.Fail "Expected symbols to be FSharpMemberOrFunctionOrValue"
+        | _ -> Assert.Fail $"Expected three symbols, got %A{symbols}"
         
+        // The setter should have a symbol for the generated parameter `v`.
+        let setVMfv =
+            checkResults.GetSymbolUsesAtLocation(5, 29, "    member val AutoPropGetSet = 0 with get, set", ["v"])
+            |> List.tryExactlyOne
+            |> Option.map chooseMemberOrFunctionOrValue
+
+        if Option.isNone setVMfv then Assert.Fail "No generated v symbol for the setter was found"
+
     [<Test>]
-    let ``Single symbol is resolved for property`` () =
+    let ``Property symbol is resolved for property`` () =
         let source = """
 type X(y: string) =
     member val Y = y with get, set
 """
 
         let _, checkResults = getParseAndCheckResults source
-        let symbolUses =
+        let propSymbol, _ =
             checkResults.GetSymbolUsesAtLocation(3, 16, "    member val Y = y with get, set", [ "Y" ])
-            |> List.map (fun su -> su.Symbol)
+            |> List.pick pickPropertySymbol
 
-        match symbolUses with
-        | [ :? FSharpMemberOrFunctionOrValue as mfv ] ->
-            Assert.True mfv.IsProperty
-            Assert.True mfv.HasGetterMethod
-            Assert.True mfv.HasSetterMethod
-            assertRange (3, 15) (3, 16) mfv.SignatureLocation.Value
-        | _ -> Assert.Fail "Expected symbols"
+        Assert.True propSymbol.IsProperty
+        Assert.True propSymbol.HasGetterMethod
+        Assert.True propSymbol.HasSetterMethod
+        assertRange (3, 15) (3, 16) propSymbol.SignatureLocation.Value
 
     [<Test>]
     let ``Multiple relevant symbols for type name`` () =
@@ -627,17 +629,14 @@ type Foo() =
     member this.Count with set (v:int) = b <- v and get () = b
 """
 
-        let getSymbolUses =
+        let propSymbol, _ =
             checkResults.GetSymbolUsesAtLocation(6, 21, "    member this.Count with set (v:int) = b <- v", ["Count"])
-            |> List.map (fun su -> su.Symbol)
+            |> List.pick pickPropertySymbol
 
-        match getSymbolUses with
-        | [ :? FSharpMemberOrFunctionOrValue as mfv ] ->
-            Assert.True mfv.IsProperty
-            Assert.True mfv.HasGetterMethod
-            Assert.True mfv.HasSetterMethod
-            assertRange (6, 16) (6, 21) mfv.SignatureLocation.Value
-        | symbols -> Assert.Fail $"Unexpected symbols, got %A{symbols}"
+        Assert.True propSymbol.IsProperty
+        Assert.True propSymbol.HasGetterMethod
+        Assert.True propSymbol.HasSetterMethod
+        assertRange (6, 16) (6, 21) propSymbol.SignatureLocation.Value
 
     [<Test>]
     let ``Property usage is reported properly`` () =
@@ -653,16 +652,65 @@ type Foo() =
 ignore (Foo().Name)
 """
 
-        let propertySymbolUse =
+        let propertySymbolUse, _ =
             checkResults.GetSymbolUsesAtLocation(6, 17, "    member x.Name", ["Name"])
-            |> List.map (fun su -> su.Symbol)
-            |> List.exactlyOne
+            |> List.pick pickPropertySymbol
 
         let usages =  checkResults.GetUsesOfSymbolInFile(propertySymbolUse)
-        Assert.AreEqual(3, usages.Length)
+        Assert.AreEqual(2, usages.Length)
         Assert.True usages.[0].IsFromDefinition
-        Assert.True usages.[1].IsFromDefinition
-        Assert.True usages.[2].IsFromUse
+        Assert.True usages.[1].IsFromUse
+
+    [<Test>]
+    let ``Property symbol is present after critical error`` () =
+        let _, checkResults = getParseAndCheckResults """
+module X
+
+let _ = UnresolvedName
+
+type X() =
+    member val Y = 1 with get, set
+"""
+
+        let _propertySymbolUse, _ =
+            checkResults.GetSymbolUsesAtLocation(7, 16, "    member val Y = 1 with get, set", ["Y"])
+            |> List.pick pickPropertySymbol
+
+        Assert.False (Array.isEmpty checkResults.Diagnostics)
+
+    [<Test>]
+    let ``Property symbol is present after critical error in property`` () =
+        let _, checkResults = getParseAndCheckResults """
+module Z
+
+type X() =
+    member val Y = UnresolvedName with get, set
+"""
+
+        let _propertySymbolUse, _ =
+            checkResults.GetSymbolUsesAtLocation(5, 16, "    member val Y = UnresolvedName with get, set", ["Y"])
+            |> List.pick pickPropertySymbol
+
+        Assert.False (Array.isEmpty checkResults.Diagnostics)
+
+    [<Test>]
+    let ``Property symbol on interface implementation`` () =
+        let _, checkResults = getParseAndCheckResults """
+module Z
+
+type I =
+    abstract P: int with get, set
+
+type T() =
+    interface I with
+        member val P = 1 with get, set
+"""
+
+        let _propertySymbolUse, mProp =
+            checkResults.GetSymbolUsesAtLocation(9, 20, "        member val P = 1 with get, set", ["P"])
+            |> List.pick pickPropertySymbol
+
+        assertRange (9, 19) (9, 20) mProp
 
 module GetValSignatureText =
     let private assertSignature (expected:string) source (lineNumber, column, line, identifier) =
diff --git a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
index 97d9a77e73f..17fea8f0a33 100644
--- a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTrivia.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some y)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([x], [], [None]), None, None,
                      Pats [Named (SynIdent (y, None), false, None, (2,6--2,7))],
diff --git a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
index db56167b2c4..dd5022f2bc2 100644
--- a/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ColonBeforeReturnTypeIsPartOfTriviaInProperties.fs.bsl
@@ -29,7 +29,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; Y], [(3,15--3,16)], [None; None]),
@@ -67,7 +67,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, None)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; Y], [(3,15--3,16)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
index 86dc6eaa1de..115b95c51eb 100644
--- a/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/ConditionalDirectiveAroundInlineKeyword.fs.bsl
@@ -14,7 +14,7 @@ ImplFile
                      SynValInfo
                        ([[SynArgInfo ([], false, Some f)];
                          [SynArgInfo ([], false, Some ar)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([map], [], [None]), None, None,
                      Pats
diff --git a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
index e65dad438cc..5a7bf976186 100644
--- a/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/InlineKeywordInBinding.fs.bsl
@@ -14,7 +14,7 @@ ImplFile
                      SynValInfo
                        ([[SynArgInfo ([], false, Some y)];
                          [SynArgInfo ([], false, Some z)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([x], [], [None]), None, None,
                      Pats
@@ -31,7 +31,7 @@ ImplFile
                             SynValInfo
                               ([[SynArgInfo ([], false, Some b)];
                                 [SynArgInfo ([], false, Some c)]],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          LongIdent
                            (SynLongIdent ([a], [], [None]), None, None,
                             Pats
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
index 25878126ec6..63b8a81ea59 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeBetweenLetKeywordAndPatternShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -21,8 +21,7 @@ ImplFile
                      Range = (2,4--2,15) }],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (LongIdent
                        (SynLongIdent ([A], [], [None]), None, None,
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
index 8c19e2511e9..db5fe5051fe 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInBindingOfSynExprObjExpr.fs.bsl
@@ -33,7 +33,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([x; ToString], [(4,12--4,13)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
index ed3e82ef381..d52e2f085ba 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMember.fs.bsl
@@ -34,7 +34,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Constructor },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             LongIdent
                               (SynLongIdent ([new], [], [None]), None,
                                Some (SynValTyparDecls (None, false)),
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
index 4b5225762b1..4717531eb39 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInConstructorSynMemberDefnMemberOptAsSpec.fs.bsl
@@ -35,7 +35,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Constructor },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               Some tony, None),
+                               Some tony),
                             LongIdent
                               (SynLongIdent ([new], [], [None]), None,
                                Some (SynValTyparDecls (None, false)),
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
index 8dab1d33401..fe111972f91 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInFullSynMemberDefnMemberProperty.fs.bsl
@@ -40,7 +40,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; TheWord], [(4,15--4,16)],
@@ -78,7 +78,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some value)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; TheWord], [(4,15--4,16)],
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
index ccc1709cf5d..2b1943b2d20 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSecondaryConstructor.fs.bsl
@@ -31,7 +31,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Constructor },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             LongIdent
                               (SynLongIdent ([new], [], [None]), None,
                                Some (SynValTyparDecls (None, false)),
@@ -57,7 +57,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Constructor },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             LongIdent
                               (SynLongIdent ([new], [], [None]), None,
                                Some (SynValTyparDecls (None, false)),
@@ -91,7 +91,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Constructor },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             LongIdent
                               (SynLongIdent ([new], [], [None]), None,
                                Some (SynValTyparDecls (None, false)),
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
index 48648d6723d..a8e5110eeb4 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnLetBindings.fs.bsl
@@ -29,7 +29,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None),
+                                None),
                              Named (SynIdent (x, None), false, None, (4,8--4,9)),
                              None, Const (Int32 8, (4,12--4,13)), (3,4--4,9),
                              Yes (3,4--4,13),
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
index 544e9227853..83139fe83ee 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynMemberDefnMember.fs.bsl
@@ -35,7 +35,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; Something], [(4,15--4,16)],
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
index 16b26430fef..08edc3d2631 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInSynModuleDeclLet.fs.bsl
@@ -19,9 +19,9 @@ ImplFile
                      Range = (2,0--2,7) }],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (a, None), false, None, (3,4--3,5)),
-                  None, Const (Int32 0, (3,8--3,9)), (2,0--3,5), Yes (2,0--3,9),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (a, None), false, None, (3,4--3,5)), None,
+                  Const (Int32 0, (3,8--3,9)), (2,0--3,5), Yes (2,0--3,9),
                   { LeadingKeyword = Let (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange = Some (3,6--3,7) })], (2,0--3,9))],
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
index 8c2637ecf53..bf0e8802e32 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfAttributeShouldBeIncludedInWriteOnlySynMemberDefnMemberProperty.fs.bsl
@@ -42,7 +42,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some value)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyWriteOnlyProperty], [(4,15--4,16)],
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
index 2b619f5d620..844946e66c3 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBinding.fs.bsl
@@ -14,7 +14,7 @@ ImplFile
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (z, None), false, None, (3,8--3,9)),
                         None, Const (Int32 2, (3,12--3,13)), (3,8--3,9),
                         Yes (3,4--3,13), { LeadingKeyword = Let (3,4--3,7)
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
index ca1ea0fb3aa..b0e567ed3bd 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInLocalLetBindingTyped.fs.bsl
@@ -16,7 +16,7 @@ ImplFile
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (z, None), false, None, (3,8--3,9)),
                         Some
                           (SynBindingReturnInfo
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
index c5a918ac00f..e76316e2210 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBinding.fs.bsl
@@ -29,7 +29,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; Y], [(3,15--3,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
index 0d0bd7ee206..b9aa74e11b9 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithParameters.fs.bsl
@@ -32,7 +32,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; Y], [(3,15--3,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
index 8ebabf6888a..2458900141d 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInMemberBindingWithReturnType.fs.bsl
@@ -32,7 +32,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; Y], [(3,15--3,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
index fd984aff8fb..92929b73a08 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInProperty.fs.bsl
@@ -32,7 +32,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty], [(3,15--3,16)],
@@ -62,7 +62,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some value)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty], [(3,15--3,16)],
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
index ea098162941..eca7f36b6dd 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -13,13 +13,12 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
-                  None, Const (Int32 12, (2,8--2,10)), (2,4--2,5),
-                  Yes (2,0--2,10), { LeadingKeyword = Let (2,0--2,3)
-                                     InlineKeyword = None
-                                     EqualsRange = Some (2,6--2,7) })],
-              (2,0--2,10))], PreXmlDocEmpty, [], None, (2,0--3,0),
-          { LeadingKeyword = None })], (true, true),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)), None,
+                  Const (Int32 12, (2,8--2,10)), (2,4--2,5), Yes (2,0--2,10),
+                  { LeadingKeyword = Let (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange = Some (2,6--2,7) })], (2,0--2,10))],
+          PreXmlDocEmpty, [], None, (2,0--3,0), { LeadingKeyword = None })],
+      (true, true), { ConditionalDirectives = []
+                      CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
index 0d2b9bc507f..651cdb4f8ce 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfEqualSignShouldBePresentInSynModuleDeclLetBindingTyped.fs.bsl
@@ -13,8 +13,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)),
                   Some
                     (SynBindingReturnInfo
                        (LongIdent (SynLongIdent ([int], [], [None])),
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
index e16c4496191..31febede5b6 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynExprLetOrUseBinding.fs.bsl
@@ -13,9 +13,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (a, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (a, None), false, None, (2,4--2,5)), None,
                   LetOrUse
                     (false, false,
                      [SynBinding
@@ -25,7 +24,7 @@ ImplFile
                            (None,
                             SynValInfo
                               ([[SynArgInfo ([], false, Some c)]],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          LongIdent
                            (SynLongIdent ([b], [], [None]), None, None,
                             Pats
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
index be738731f79..0a175553cad 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBinding.fs.bsl
@@ -13,13 +13,12 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
-                  None, Const (Int32 12, (2,8--2,10)), (2,4--2,5),
-                  Yes (2,0--2,10), { LeadingKeyword = Let (2,0--2,3)
-                                     InlineKeyword = None
-                                     EqualsRange = Some (2,6--2,7) })],
-              (2,0--2,10))], PreXmlDocEmpty, [], None, (2,0--3,0),
-          { LeadingKeyword = None })], (true, true),
-      { ConditionalDirectives = []
-        CodeComments = [] }, set []))
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)), None,
+                  Const (Int32 12, (2,8--2,10)), (2,4--2,5), Yes (2,0--2,10),
+                  { LeadingKeyword = Let (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange = Some (2,6--2,7) })], (2,0--2,10))],
+          PreXmlDocEmpty, [], None, (2,0--3,0), { LeadingKeyword = None })],
+      (true, true), { ConditionalDirectives = []
+                      CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
index 7dbd1e99ce1..613931862dd 100644
--- a/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/RangeOfLetKeywordShouldBePresentInSynModuleDeclLetBindingWithAttributes.fs.bsl
@@ -21,13 +21,12 @@ ImplFile
                      Range = (3,0--3,17) }],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (5,4--5,5)),
-                  None, Const (Int32 12, (5,8--5,10)), (2,0--5,5),
-                  Yes (3,0--5,10), { LeadingKeyword = Let (5,0--5,3)
-                                     InlineKeyword = None
-                                     EqualsRange = Some (5,6--5,7) })],
-              (2,0--5,10))], PreXmlDocEmpty, [], None, (3,0--6,0),
-          { LeadingKeyword = None })], (true, true),
-      { ConditionalDirectives = []
-        CodeComments = [LineComment (4,0--4,15)] }, set []))
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (5,4--5,5)), None,
+                  Const (Int32 12, (5,8--5,10)), (2,0--5,5), Yes (3,0--5,10),
+                  { LeadingKeyword = Let (5,0--5,3)
+                    InlineKeyword = None
+                    EqualsRange = Some (5,6--5,7) })], (2,0--5,10))],
+          PreXmlDocEmpty, [], None, (3,0--6,0), { LeadingKeyword = None })],
+      (true, true), { ConditionalDirectives = []
+                      CodeComments = [LineComment (4,0--4,15)] }, set []))
diff --git a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
index 8c305453870..a8dae863d64 100644
--- a/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
+++ b/tests/service/data/SyntaxTree/Binding/TupleReturnTypeOfBindingShouldContainStars.fs.bsl
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (a, None), false, None, (2,4--2,5)),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (a, None), false, None, (2,4--2,5)),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
@@ -43,8 +43,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (b, None), false, None, (3,4--3,5)),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (b, None), false, None, (3,4--3,5)),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
diff --git a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
index eb4a38fff41..91dffc0ee66 100644
--- a/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/BlockCommentInSourceCode.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some c)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([a], [], [None]), None, None,
                      Pats
diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
index 40e38789974..85dd058c92d 100644
--- a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldBeCapturedIfUsedInAnInvalidLocation.fs.bsl
@@ -13,9 +13,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (x, None), false, None, (3,4--3,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (x, None), false, None, (3,4--3,5)), None,
                   Sequential
                     (SuppressNeither, true,
                      While
diff --git a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
index bc183efb267..fafd932e041 100644
--- a/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
+++ b/tests/service/data/SyntaxTree/CodeComment/TripleSlashCommentShouldNotBeCaptured.fs.bsl
@@ -10,9 +10,9 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (x, None), false, None, (3,4--3,5)),
-                  None, Const (Int32 0, (3,8--3,9)), (2,0--3,5), Yes (3,0--3,9),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (x, None), false, None, (3,4--3,5)), None,
+                  Const (Int32 0, (3,8--3,9)), (2,0--3,5), Yes (3,0--3,9),
                   { LeadingKeyword = Let (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange = Some (3,6--3,7) })], (2,0--3,9))],
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
index 5baebcb4cf2..8a7a55c28a1 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineCommentAreNotReportedAsTrivia.fs.bsl
@@ -13,9 +13,9 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
-                  None, Const (Int32 42, (8,4--8,6)), (2,4--2,5), Yes (2,0--8,6),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)), None,
+                  Const (Int32 42, (8,4--8,6)), (2,4--2,5), Yes (2,0--8,6),
                   { LeadingKeyword = Let (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange = Some (2,6--2,7) })], (2,0--8,6))],
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
index fe0025e2c3d..231cfd08d6f 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/DirectivesInMultilineStringAreNotReportedAsTrivia.fs.bsl
@@ -12,9 +12,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)), None,
                   Const
                     (String
                        ("
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
index b79c1cf78bb..9f409f45808 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfElseEndif.fs.bsl
@@ -10,14 +10,14 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
-                  None, Const (Int32 3, (10,8--10,9)), (2,4--2,5),
-                  Yes (2,0--10,9), { LeadingKeyword = Let (2,0--2,3)
-                                     InlineKeyword = None
-                                     EqualsRange = Some (2,6--2,7) })],
-              (2,0--10,9))], PreXmlDocEmpty, [], None, (2,0--12,0),
-          { LeadingKeyword = None })], (true, true),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)), None,
+                  Const (Int32 3, (10,8--10,9)), (2,4--2,5), Yes (2,0--10,9),
+                  { LeadingKeyword = Let (2,0--2,3)
+                    InlineKeyword = None
+                    EqualsRange = Some (2,6--2,7) })], (2,0--10,9))],
+          PreXmlDocEmpty, [], None, (2,0--12,0), { LeadingKeyword = None })],
+      (true, true),
       { ConditionalDirectives =
          [If (Ident "FOO", (3,4--3,11)); If (Ident "MEH", (4,8--4,15));
           Else (6,8--6,13); EndIf (8,8--8,14); Else (9,4--9,9);
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
index d711c1ca5b2..25821646aa0 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/NestedIfEndifWithComplexExpressions.fs.bsl
@@ -10,9 +10,9 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
-                  None, Const (Unit, (11,4--11,6)), (2,4--2,5), Yes (2,0--11,6),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)), None,
+                  Const (Unit, (11,4--11,6)), (2,4--2,5), Yes (2,0--11,6),
                   { LeadingKeyword = Let (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange = Some (2,6--2,7) })], (2,0--11,6))],
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
index 8309805dc19..72ac590cc94 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfElseEndif.fs.bsl
@@ -10,9 +10,9 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
-                  None, Const (Int32 42, (6,4--6,6)), (2,4--2,5), Yes (2,0--6,6),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)), None,
+                  Const (Int32 42, (6,4--6,6)), (2,4--2,5), Yes (2,0--6,6),
                   { LeadingKeyword = Let (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange = Some (2,6--2,7) })], (2,0--6,6))],
diff --git a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
index 2ffc6d26257..cd4a4243c4e 100644
--- a/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
+++ b/tests/service/data/SyntaxTree/ConditionalDirective/SingleIfEndif.fs.bsl
@@ -10,9 +10,9 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (v, None), false, None, (2,4--2,5)),
-                  None, Const (Int32 42, (6,4--6,6)), (2,4--2,5), Yes (2,0--6,6),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (v, None), false, None, (2,4--2,5)), None,
+                  Const (Int32 42, (6,4--6,6)), (2,4--2,5), Yes (2,0--6,6),
                   { LeadingKeyword = Let (2,0--2,3)
                     InlineKeyword = None
                     EqualsRange = Some (2,6--2,7) })], (2,0--6,6))],
diff --git a/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
index b91f453d433..8326a320162 100644
--- a/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Exception/SynExceptionDefnShouldContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -28,7 +28,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent ([Meh], [], [None]), None, None,
                            Pats
diff --git a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl
index 208bba9095e..90e976cc843 100644
--- a/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/AnonymousRecords-06.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some x)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([f], [], [None]), None, None,
                      Pats [Named (SynIdent (x, None), false, None, (1,6--1,7))],
diff --git a/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl
index 48b5bd70e23..6717b3e3537 100644
--- a/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Binary - Plus 05.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   App
                     (NonAtomic, false,
                      App
diff --git a/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl
index 7b34bcfa7a5..2bf1e3df8cb 100644
--- a/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Do 03.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   Do
                     (ArbitraryAfterError ("hardwhiteDoBinding1", (4,6--4,6)),
                      (4,4--4,6)), (3,4--3,5), Yes (3,0--4,6),
diff --git a/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl
index b159aa693b0..7edad619273 100644
--- a/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Do 04.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   Do (Const (Int32 1, (5,8--5,9)), (4,4--5,9)), (3,4--3,5),
                   Yes (3,0--5,9), { LeadingKeyword = Let (3,0--3,3)
                                     InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl
index 6e3d9641ae4..8707692afc7 100644
--- a/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Do 05.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   Do (Const (Int32 1, (5,4--5,5)), (4,4--5,5)), (3,4--3,5),
                   Yes (3,0--5,5), { LeadingKeyword = Let (3,0--3,3)
                                     InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl
index b65fe6bd9c6..e0923b67823 100644
--- a/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/DotLambda - _ Recovery - Casts.fsx.bsl	
@@ -10,9 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (a, None), false, None, (1,4--1,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (a, None), false, None, (1,4--1,5)), None,
                   Typed
                     (Paren
                        (InferredUpcast
@@ -29,9 +28,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (b, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (b, None), false, None, (2,4--2,5)), None,
                   Typed
                     (Paren
                        (Upcast
@@ -49,9 +47,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (c, None), false, None, (3,4--3,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (c, None), false, None, (3,4--3,5)), None,
                   Paren
                     (Upcast
                        (FromParseError (Ident _, (3,10--3,11)),
diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl
index ea3c2f9f236..cba7a3d17c6 100644
--- a/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/DotLambda_ArgumentExpressionInInnerAppExpression.fs.bsl
@@ -12,8 +12,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (1,4--1,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (1,4--1,5), None,
                   App
                     (NonAtomic, false,
                      App
diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl
index aec3a40ae97..378bed8cdf2 100644
--- a/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/DotLambda_FunctionWithUnderscoreDotLambda.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (myFunc, None), false, None, (1,4--1,10)),
                   None,
                   DotLambda
diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl
index 57d284dc75d..ad08dcfcd15 100644
--- a/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/DotLambda_NestedPropertiesAfterUnderscore.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (myFunc, None), false, None, (1,4--1,10)),
                   None,
                   DotLambda
diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl
index 86e826b8007..561a8c4d1ee 100644
--- a/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/DotLambda_NotAllowedFunctionExpressionWithArg.fs.bsl
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (1,4--1,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (1,4--1,5), None,
                   App
                     (NonAtomic, false,
                      DotLambda
diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl
index 5fab8008612..7b8f9aa8c69 100644
--- a/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/DotLambda_TopLevelLet.fs.bsl
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (1,4--1,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (1,4--1,5), None,
                   App
                     (NonAtomic, false,
                      App
diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionNallWithSpaceAndUnitApplication.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionNallWithSpaceAndUnitApplication.fs.bsl
index eddb0cc21cc..f4beb66f1ae 100644
--- a/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionNallWithSpaceAndUnitApplication.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/DotLambda_UnderscoreToFunctionNallWithSpaceAndUnitApplication.fs.bsl
@@ -13,8 +13,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (myFunc, None), false, None, (1,4--1,10)),
                   None,
                   App
diff --git a/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl b/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl
index 7562ce7b7a0..2aaeb2c9bff 100644
--- a/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/DotLambda_WithNonTupledFunctionCall.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (myFunc, None), false, None, (1,4--1,10)),
                   None,
                   App
diff --git a/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl
index db37582dc20..023ec9d79e0 100644
--- a/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/For 03.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   ForEach
                     (Yes (4,4--4,7), Yes (4,10--4,12), SeqExprOnly false, true,
                      Wild (4,8--4,9), Const (Int32 1, (4,13--4,14)),
diff --git a/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl
index 9a1cd39bce2..41ed392a753 100644
--- a/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/For 04.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   ForEach
                     (Yes (4,4--4,7), Yes (4,10--4,12), SeqExprOnly false, true,
                      Wild (4,8--4,9), Const (Int32 1, (4,13--4,14)),
diff --git a/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl
index 8853a7dfdd7..9a71d8f9e4c 100644
--- a/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/For 05.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   ForEach
                     (Yes (4,4--4,7), Yes (4,10--4,12), SeqExprOnly false, true,
                      Wild (4,8--4,9), Const (Int32 1, (4,13--4,14)),
diff --git a/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl
index c74c5a5240d..016bc4dbfe7 100644
--- a/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/If 08.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   IfThenElse
                     (Const (Unit, (4,7--4,9)), Const (Unit, (4,15--4,17)),
                      Some (Const (Unit, (4,23--4,25))), Yes (4,4--4,14), false,
diff --git a/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl
index d8752038ba1..6541b409bd9 100644
--- a/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/If 09.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   IfThenElse
                     (Const (Unit, (4,7--4,9)), Const (Unit, (4,15--4,17)),
                      Some (Const (Unit, (5,4--5,6))), Yes (4,4--4,14), false,
diff --git a/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl
index c330aa0ae0c..ef03391599d 100644
--- a/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/If 10.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   IfThenElse
                     (Const (Unit, (4,7--4,9)), Const (Unit, (4,15--4,17)),
                      Some
diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl
index d2fb542124f..9af75da75fe 100644
--- a/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Lazy 01.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   Lazy (Const (Int32 1, (5,8--5,9)), (4,4--5,9)), (3,4--3,5),
                   Yes (3,0--5,9), { LeadingKeyword = Let (3,0--3,3)
                                     InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl
index 4d7df22426d..32e1522a9e5 100644
--- a/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Lazy 02.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   Lazy (Const (Int32 1, (5,4--5,5)), (4,4--5,5)), (3,4--3,5),
                   Yes (3,0--5,5), { LeadingKeyword = Let (3,0--3,3)
                                     InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl
index 4008adc5644..17a4c9785fb 100644
--- a/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Lazy 03.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   Lazy
                     (ArbitraryAfterError ("declExprBlock1", (4,8--4,8)),
                      (4,4--4,8)), (3,4--3,5), Yes (3,0--4,8),
diff --git a/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl
index e6b8f512427..8eaabfb3d65 100644
--- a/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Let 01.fs.bsl	
@@ -9,11 +9,11 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None, Const (Unit, (4,4--4,6)),
-                  (3,4--3,5), Yes (3,0--4,6), { LeadingKeyword = Let (3,0--3,3)
-                                                InlineKeyword = None
-                                                EqualsRange = Some (3,6--3,7) })],
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None, Const (Unit, (4,4--4,6)), (3,4--3,5),
+                  Yes (3,0--4,6), { LeadingKeyword = Let (3,0--3,3)
+                                    InlineKeyword = None
+                                    EqualsRange = Some (3,6--3,7) })],
               (3,0--4,6)); Expr (Const (Unit, (6,0--6,2)), (6,0--6,2))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--6,2), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl
index 967b5cc3b1f..bf9b340b539 100644
--- a/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Let 02.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   ArbitraryAfterError ("localBinding1", (3,7--3,7)), (3,4--3,5),
                   Yes (3,4--3,7), { LeadingKeyword = Let (3,0--3,3)
                                     InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index 18a26f2b638..132e7030303 100644
--- a/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/NestedSynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -12,8 +12,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([f], [], [None]), None, None,
                      Pats [Paren (Const (Unit, (2,6--2,8)), (2,6--2,8))], None,
@@ -25,7 +24,7 @@ ImplFile
                          PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                          SynValData
                            (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                            None, None),
+                            None),
                          Named (SynIdent (x, None), false, None, (3,8--3,9)),
                          None, Const (Int32 1, (3,12--3,13)), (3,8--3,9),
                          Yes (3,4--3,13), { LeadingKeyword = Let (3,4--3,7)
@@ -39,7 +38,7 @@ ImplFile
                             SynValData
                               (None,
                                SynValInfo ([], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             Named (SynIdent (y, None), false, None, (4,8--4,9)),
                             None, Const (Int32 2, (4,12--4,13)), (4,8--4,9),
                             Yes (4,4--4,13), { LeadingKeyword = Let (4,4--4,7)
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl
index c3c45df5aaf..cf716944487 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 01.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent ([_; P1], [(4,14--4,15)], [None; None]),
                            None, None, Pats [], None, (4,13--4,17)), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl
index 0cb601999ba..9a06f01ae6e 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 02.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent ([_; P1], [(4,16--4,17)], [None; None]),
                            None, None, Pats [], None, (4,15--4,19)), None,
@@ -46,7 +46,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([_; P2], [(7,14--7,15)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl
index 541e822275c..92401919062 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 03.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent ([_; P1], [(4,16--4,17)], [None; None]),
                            None, None, Pats [], None, (4,15--4,19)), None,
@@ -46,7 +46,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([_; P2], [(7,14--7,15)], [None; None]), None,
@@ -73,7 +73,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([_; P3], [(10,14--10,15)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl
index 46ee7f5f3b0..02f2b2c4bb5 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 07.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         Named (SynIdent (this, None), false, None, (4,12--4,16)),
                         None, ArbitraryAfterError ("memberCore2", (4,16--4,16)),
                         (4,12--4,16), NoneAtInvisible,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl
index 176788da428..b4a5df07136 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 08.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         Named (SynIdent (this, None), false, None, (4,12--4,16)),
                         None, ArbitraryAfterError ("memberCore2", (4,16--4,16)),
                         (4,12--4,19), NoneAtInvisible,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl
index 6dfc3a6c95a..5fc68741000 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 09.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P], [(4,16--4,17)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl
index b7d5c067cdc..d7670c74151 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 10.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P], [(4,16--4,17)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl
index 5be6c820313..ff41ad2a5d8 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 11.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P1], [(4,16--4,17)], [None; None]), None,
@@ -45,7 +45,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P2], [(5,16--5,17)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl
index e7c408ac27c..53d26ec6e93 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 12.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P1], [(4,16--4,17)], [None; None]), None,
@@ -44,7 +44,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P2], [(5,16--5,17)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl
index e7515c3da28..3e636b4785c 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 13.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         Named (SynIdent (this, None), false, None, (4,12--4,16)),
                         None, ArbitraryAfterError ("memberCore1", (4,16--4,16)),
                         (4,12--5,5), NoneAtInvisible,
@@ -41,7 +41,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P2], [(5,16--5,17)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl
index 5b327948723..64530949bbc 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 14.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         Named (SynIdent (this, None), false, None, (4,12--4,16)),
                         None, ArbitraryAfterError ("memberCore1", (4,16--4,16)),
                         (4,12--4,16), NoneAtInvisible,
@@ -41,7 +41,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P2], [(5,16--5,17)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl b/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl
index 58a61133026..c9b041181af 100644
--- a/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Object - Class 15.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([this; P2], [(5,16--5,17)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl
index e9233e656c1..ee798381576 100644
--- a/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Set 04.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   LongIdentSet
                     (SynLongIdent ([x], [], [None]),
                      ArbitraryAfterError ("declExprBlock1", (4,8--4,8)),
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
index 2481d16eba9..98964bd7ecf 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprDoContainsTheRangeOfTheDoKeyword.fs.bsl
@@ -10,9 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (a, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (a, None), false, None, (2,4--2,5)), None,
                   Sequential
                     (SuppressNeither, true, Do (Ident foobar, (3,4--4,14)),
                      DoBang (Ident foobarBang, (5,4--6,18)), (3,4--6,18)),
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
index cf1e4f94b43..f9ce333429a 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseContainsTheRangeOfInKeyword.fs.bsl
@@ -12,7 +12,7 @@ ImplFile
                      PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                      SynValData
                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                        None, None),
+                        None),
                      Named (SynIdent (x, None), false, None, (2,4--2,5)), None,
                      Const (Int32 1, (2,8--2,9)), (2,4--2,5), Yes (2,0--2,9),
                      { LeadingKeyword = Let (2,0--2,3)
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
index 626e2c17377..54c3f8180e4 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -15,7 +15,7 @@ ImplFile
                         PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (x, None), false, None, (3,4--3,5)),
                         None, Const (Int32 1, (3,8--3,9)), (3,4--3,5),
                         Yes (3,0--3,9), { LeadingKeyword = Let (3,0--3,3)
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
index 747c0d8f8a9..a5d102356f1 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWhereBodyExprStartsWithTokenOfTwoCharactersDoesNotContainTheRangeOfInKeyword.fs.bsl
@@ -17,7 +17,7 @@ ImplFile
                         PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (e1, None), false, None, (3,4--3,6)),
                         None,
                         Downcast
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
index 5683e65d5b5..72352706810 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprLetOrUseWithRecursiveBindingContainsTheRangeOfInKeyword.fs.bsl
@@ -16,7 +16,7 @@ ImplFile
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (f, None), false, None, (3,12--3,13)),
                         None, Const (Unit, (3,16--3,18)), (3,12--3,13),
                         Yes (3,4--3,18),
@@ -28,7 +28,7 @@ ImplFile
                         PreXmlDoc ((4,8), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (g, None), false, None, (4,8--4,9)),
                         None, Const (Unit, (4,12--4,14)), (4,8--4,9),
                         Yes (4,4--4,14), { LeadingKeyword = And (4,4--4,7)
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
index 7a1a10cc0c1..c84d9fb3d27 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprObjExprContainsTheRangeOfWithKeyword.fs.bsl
@@ -21,7 +21,7 @@ ImplFile
                                   MemberKind = Member },
                            SynValInfo
                              ([[SynArgInfo ([], false, None)]; []],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent
                              ([x; ToString], [(3,12--3,13)], [None; None]), None,
@@ -64,7 +64,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([x; GetEnumerator], [(6,12--6,13)],
diff --git a/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
index 12ec1bbfcf8..717ef3af2f2 100644
--- a/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
+++ b/tests/service/data/SyntaxTree/Expression/SynExprObjWithSetter.fs.bsl
@@ -73,7 +73,7 @@ ImplFile
                               SynValInfo
                                 ([[SynArgInfo ([], false, None)];
                                   [SynArgInfo ([], false, Some v)]],
-                                 SynArgInfo ([], false, None)), None, None),
+                                 SynArgInfo ([], false, None)), None),
                            LongIdent
                              (SynLongIdent
                                 ([this; AbstractClassPropertySet],
diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl
index 9c7752bdd73..d2437e5ebfc 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 01.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryFinally
                     (Const (Int32 1, (4,8--4,9)), Const (Int32 2, (5,12--5,13)),
                      (4,4--5,13), Yes (4,4--4,7), Yes (5,4--5,11),
diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl
index 9bdb9d005f8..4d463ef1077 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 02.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryFinally
                     (Const (Int32 1, (4,8--4,9)), Const (Int32 2, (6,8--6,9)),
                      (4,4--6,9), Yes (4,4--4,7), Yes (5,4--5,11),
diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl
index 487812e9a8e..2ad046c6c6a 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 03.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryFinally
                     (Const (Int32 1, (4,8--4,9)), Const (Int32 2, (6,4--6,5)),
                      (4,4--6,5), Yes (4,4--4,7), Yes (5,4--5,11),
diff --git a/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl
index 250278238f2..58c6e87e550 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - Finally 04.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryFinally
                     (Const (Int32 1, (4,8--4,9)),
                      ArbitraryAfterError
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl
index 94ab1be098c..beb30aedfe4 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 01.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)),
                      [SynMatchClause
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl
index 17edefbbbca..0fa71a2d560 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 02.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)),
                      [SynMatchClause
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl
index 8cbcb4ef37d..f357989f6d7 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 03.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)),
                      [SynMatchClause
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl
index e217c1e2539..b3ed1e9fdf0 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 04.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)),
                      [SynMatchClause
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl
index ca795cc22bd..cce7a7716ca 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 05.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)),
                      [SynMatchClause
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl
index eb9840fb8c8..2f37ac458b1 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 06.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)), [], (4,4--5,8), Yes (4,4--4,7),
                      Yes (5,4--5,8), { TryKeyword = (4,4--4,7)
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl
index 93733b7f470..394af4cbd7c 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 07.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)),
                      [SynMatchClause
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl
index d70a694debe..bcad7831beb 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 08.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)),
                      [SynMatchClause
diff --git a/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl
index a36973dec18..d3557177c85 100644
--- a/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try - With 09.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)), [], (4,4--5,8), Yes (4,4--4,7),
                      Yes (5,4--5,8), { TryKeyword = (4,4--4,7)
diff --git a/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl
index eeae7b2690a..94e5c9c690d 100644
--- a/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try 01.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (Const (Int32 1, (4,8--4,9)), [], (4,4--4,9), Yes (4,4--4,7),
                      Yes (4,9--4,9), { TryKeyword = (4,4--4,7)
diff --git a/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl
index 13a9a8d9753..b1330bbff79 100644
--- a/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Try 02.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   TryWith
                     (ArbitraryAfterError ("try1", (4,7--4,7)), [], (4,4--4,7),
                      Yes (4,4--4,7), Yes (4,7--4,7),
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 541d39ddecd..94ee31ce8d1 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	
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None), Wild (5,4--5,5), None,
+                           None), Wild (5,4--5,5), None,
                         Const (Unit, (5,8--5,10)), (5,4--5,5), Yes (5,0--5,10),
                         { LeadingKeyword = Let (5,0--5,3)
                           InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl
index 4ca60effd03..d44279250a4 100644
--- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 10.fs.bsl	
@@ -10,9 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (x, None), false, None, (3,4--3,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (x, None), false, None, (3,4--3,5)), None,
                   Tuple
                     (false,
                      [Const (Int32 1, (3,8--3,9));
diff --git a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl
index b86d039bf88..df9f4900d70 100644
--- a/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Tuple - Missing item 11.fs.bsl	
@@ -10,12 +10,12 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (x, None), false, None, (3,4--3,5)),
-                  None, ArbitraryAfterError ("localBinding1", (3,7--3,7)),
-                  (3,4--3,5), Yes (3,4--3,7), { LeadingKeyword = Let (3,0--3,3)
-                                                InlineKeyword = None
-                                                EqualsRange = Some (3,6--3,7) })],
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (x, None), false, None, (3,4--3,5)), None,
+                  ArbitraryAfterError ("localBinding1", (3,7--3,7)), (3,4--3,5),
+                  Yes (3,4--3,7), { LeadingKeyword = Let (3,0--3,3)
+                                    InlineKeyword = None
+                                    EqualsRange = Some (3,6--3,7) })],
               (3,0--3,7))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--3,7), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl
index 8b91eb44643..669efb602f1 100644
--- a/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/Unfinished escaped ident 02.fs.bsl	
@@ -29,7 +29,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; ], [(4,15--4,16)], [None; None]), None,
@@ -56,7 +56,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; ], [(6,15--6,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl
index 424f435a126..f8e8df6f239 100644
--- a/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/While 03.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   While
                     (Yes (4,4--4,11), Const (Int32 1, (4,10--4,11)),
                      ArbitraryAfterError ("whileBody1", (6,0--6,1)), (4,4--4,14)),
diff --git a/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl
index 15362d20268..525fd0e42a5 100644
--- a/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/While 04.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   While
                     (Yes (4,4--4,11), Const (Int32 1, (4,10--4,11)),
                      ArbitraryAfterError ("whileBody1", (5,0--5,0)), (4,4--4,14)),
diff --git a/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl
index 5cb6c7440a3..b6d3daf4f51 100644
--- a/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/While 05.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   While
                     (Yes (4,4--4,11), Const (Int32 1, (4,10--4,11)),
                      Const (Int32 2, (5,8--5,9)), (4,4--5,9)), (3,4--3,5),
diff --git a/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl
index a298c540af6..e106a73365d 100644
--- a/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/While 06.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   While
                     (Yes (4,4--4,11), Const (Int32 1, (4,10--4,11)),
                      Const (Int32 2, (5,4--5,5)), (4,4--5,5)), (3,4--3,5),
diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl
index 7c91e03d626..a5793465b34 100644
--- a/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/WhileBang 03.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   WhileBang
                     (Yes (4,4--4,32),
                      App
diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl
index 46c7b85243a..863c8aaabfe 100644
--- a/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/WhileBang 04.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   WhileBang
                     (Yes (4,4--4,32),
                      App
diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl
index 325d79b29f7..e2f5875ef4b 100644
--- a/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/WhileBang 05.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   WhileBang
                     (Yes (4,4--4,32),
                      App
diff --git a/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl b/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl
index e736197f272..3c8ef1cbebf 100644
--- a/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Expression/WhileBang 06.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   WhileBang
                     (Yes (4,4--4,32),
                      App
diff --git a/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl b/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl
index 57c36d81411..efb3580fda3 100644
--- a/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Extern/Extern 01.fs.bsl	
@@ -46,7 +46,7 @@ ImplFile
                      SynValInfo
                        ([[SynArgInfo ([], false, Some inRef);
                           SynArgInfo ([], false, Some outParentRef)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([GetParent], [], [None]), None,
                      Some (SynValTyparDecls (None, false)),
diff --git a/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
index 609eb52e896..8b6a9a601fc 100644
--- a/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
+++ b/tests/service/data/SyntaxTree/Extern/ExternKeywordIsPresentInTrivia.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([GetProcessHeap], [], [None]), None,
                      Some (SynValTyparDecls (None, false)),
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
index ba8d22cf929..7376e64e8e4 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/AndKeyword.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some b)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([a], [], [None]), None, None,
                      Pats
@@ -39,7 +39,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some e)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([d], [], [None]), None, None,
                      Pats [Named (SynIdent (e, None), false, None, (3,6--3,7))],
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
index 8580a3a53b1..41ed25792f7 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoKeyword.fs.bsl
@@ -18,7 +18,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (3,4--3,9)), None,
+                                None), Const (Unit, (3,4--3,9)), None,
                              Const (Unit, (3,7--3,9)), (3,4--3,9), NoneAtDo,
                              { LeadingKeyword = Do (3,4--3,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
index 290ccc9b59f..1c7e811ab69 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/DoStaticKeyword.fs.bsl
@@ -18,7 +18,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (3,11--3,16)), None,
+                                None), Const (Unit, (3,11--3,16)), None,
                              Const (Unit, (3,14--3,16)), (3,11--3,16), NoneAtDo,
                              { LeadingKeyword =
                                 StaticDo ((3,4--3,10), (3,11--3,13))
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
index f99aed7821e..ae6df6a8091 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/ExternKeyword.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([Meh], [], [None]), None,
                      Some (SynValTyparDecls (None, false)),
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
index ffb5c66346d..c783b4b4354 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetKeyword.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some b)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([a], [], [None]), None, None,
                      Pats [Named (SynIdent (b, None), false, None, (2,6--2,7))],
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
index 1ab02450392..a5ecb2a98b5 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/LetRecKeyword.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some b)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([a], [], [None]), None, None,
                      Pats
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
index 0405d427e3e..d9497db0bfe 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/MemberKeyword.fs.bsl
@@ -25,7 +25,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; Y], [(3,15--3,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
index f0affbc321c..bc62b3fc078 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/NewKeyword.fs.bsl
@@ -29,7 +29,7 @@ ImplFile
                                       MemberKind = Constructor },
                                SynValInfo
                                  ([[SynArgInfo ([], false, Some message)]],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent ([new], [], [None]), None,
                                Some (SynValTyparDecls (None, false)),
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
index 2809127ab9f..896ea64e69b 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/OverrideKeyword.fs.bsl
@@ -25,7 +25,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent ([E], [], [None]), None, None,
                                Pats [], None, (3,13--3,14)),
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
index fdd9e57fffb..25ad616ec0f 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetKeyword.fs.bsl
@@ -19,7 +19,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None),
+                                None),
                              LongIdent
                                (SynLongIdent ([PI], [], [None]), None, None,
                                 Pats [], None, (3,15--3,17)), None,
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
index e2d8c3a7e71..a0851241351 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticLetRecKeyword.fs.bsl
@@ -19,7 +19,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([[]], SynArgInfo ([], false, None)),
-                                None, None),
+                                None),
                              LongIdent
                                (SynLongIdent ([forever], [], [None]), None, None,
                                 Pats
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
index 98fcbd375d4..70b40e7ccd2 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/StaticMemberKeyword.fs.bsl
@@ -24,7 +24,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Member },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             LongIdent
                               (SynLongIdent ([Y], [], [None]), None, None,
                                Pats [], None, (3,18--3,19)),
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
index a0590580fae..b833f40ae10 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/SyntheticKeyword.fs.bsl
@@ -12,7 +12,7 @@ ImplFile
                     (None, Normal, false, false, [], PreXmlDocEmpty,
                      SynValData
                        (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                        None, None),
+                        None),
                      Named (SynIdent (a, None), false, None, (3,4--3,5)), None,
                      Const (Unit, (3,8--3,10)), (3,4--3,5), Yes (3,8--3,10),
                      { LeadingKeyword = Synthetic
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
index f0aa8fc7c21..b2b3420c806 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseKeyword.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (x, None), false, None, (3,8--3,9)),
                         None,
                         App
diff --git a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
index 01dfceffd2e..7dbbc35edd7 100644
--- a/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/LeadingKeyword/UseRecKeyword.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (x, None), false, None, (3,12--3,13)),
                         None,
                         App
diff --git a/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl
index 19d324a731a..787b09b31dc 100644
--- a/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/MatchClause/Missing expr 05.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   Match
                     (Yes (4,4--4,17), Const (Unit, (4,10--4,12)),
                      [SynMatchClause
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
index e5ca96208f6..d1be520bff7 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfMultipleSynMatchClause.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named
                           (SynIdent (content, None), false, None, (3,8--3,15)),
                         None,
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
index 73b389163c3..dce57b959f6 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClause.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named
                           (SynIdent (content, None), false, None, (3,8--3,15)),
                         None,
diff --git a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
index fed046dc51e..ea10cf70558 100644
--- a/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
+++ b/tests/service/data/SyntaxTree/MatchClause/RangeOfSingleSynMatchClauseFollowedByBar.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((3,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named
                           (SynIdent (content, None), false, None, (3,8--3,15)),
                         None,
diff --git a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
index 697f99c7f20..b0150fbdc0b 100644
--- a/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
+++ b/tests/service/data/SyntaxTree/Measure/MeasureContainsTheRangeOfTheConstant.fs.bsl
@@ -10,9 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (n, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (n, None), false, None, (2,4--2,5)), None,
                   Const
                     (Measure
                        (Decimal 1.0M, (2,8--2,12),
@@ -29,9 +28,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (m, None), false, None, (3,4--3,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (m, None), false, None, (3,4--3,5)), None,
                   Const
                     (Measure
                        (Double 7.0, (3,8--3,13),
diff --git a/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl
index 9267bd73fe9..00760cf2537 100644
--- a/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Auto property 09.fs.bsl	
@@ -46,7 +46,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P2], [(5,15--5,16)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl b/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl
index 62b6910532a..d0c7a6c9dbc 100644
--- a/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Auto property 13.fs.bsl	
@@ -46,7 +46,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P2], [(5,15--5,16)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl
index 62473ed47ff..5f63d7bdc38 100644
--- a/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Do 01.fs.bsl	
@@ -17,7 +17,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (5,4--5,8)), None,
+                                None), Const (Unit, (5,4--5,8)), None,
                              Const (Int32 1, (5,7--5,8)), (5,4--5,8), NoneAtDo,
                              { LeadingKeyword = Do (5,4--5,6)
                                InlineKeyword = None
@@ -28,7 +28,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,8)), None,
+                                None), Const (Unit, (7,4--7,8)), None,
                              Const (Int32 2, (7,7--7,8)), (7,4--7,8), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl
index 04306e9e1cb..1585d6135ee 100644
--- a/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Do 02.fs.bsl	
@@ -17,7 +17,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (5,11--5,15)), None,
+                                None), Const (Unit, (5,11--5,15)), None,
                              Const (Int32 1, (5,14--5,15)), (5,11--5,15),
                              NoneAtDo,
                              { LeadingKeyword =
@@ -30,7 +30,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,8)), None,
+                                None), Const (Unit, (7,4--7,8)), None,
                              Const (Int32 2, (7,7--7,8)), (7,4--7,8), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl
index e975ce70a0c..b255897d0e8 100644
--- a/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Do 03.fs.bsl	
@@ -17,7 +17,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (5,11--5,13)), None,
+                                None), Const (Unit, (5,11--5,13)), None,
                              ArbitraryAfterError
                                ("hardwhiteDoBinding1", (5,13--5,13)),
                              (5,11--5,13), NoneAtDo,
@@ -31,7 +31,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,9)), None,
+                                None), Const (Unit, (7,4--7,9)), None,
                              Const (Unit, (7,7--7,9)), (7,4--7,9), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl
index 3b841e1778c..637426c98df 100644
--- a/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Do 04.fs.bsl	
@@ -17,7 +17,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (5,4--5,6)), None,
+                                None), Const (Unit, (5,4--5,6)), None,
                              ArbitraryAfterError
                                ("hardwhiteDoBinding1", (5,6--5,6)), (5,4--5,6),
                              NoneAtDo, { LeadingKeyword = Do (5,4--5,6)
@@ -30,7 +30,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,9)), None,
+                                None), Const (Unit, (7,4--7,9)), None,
                              Const (Unit, (7,7--7,9)), (7,4--7,9), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl b/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl
index 5243483c2bc..3d88c0ff50d 100644
--- a/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/GetSetMember 01.fs.bsl	
@@ -33,7 +33,7 @@ ImplFile
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some key1);
                                        SynArgInfo ([], false, Some key2)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([f; X], [(4,12--4,13)], [None; None]),
@@ -74,7 +74,7 @@ ImplFile
                                       [SynArgInfo ([], false, Some key1);
                                        SynArgInfo ([], false, Some key2);
                                        SynArgInfo ([], false, Some value)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([f; X], [(4,12--4,13)], [None; None]),
@@ -121,7 +121,7 @@ ImplFile
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some key1);
                                        SynArgInfo ([], false, Some key2)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([f; Y], [(5,21--5,22)], [None; None]),
@@ -162,7 +162,7 @@ ImplFile
                                       [SynArgInfo ([], false, Some key1);
                                        SynArgInfo ([], false, Some key2);
                                        SynArgInfo ([], false, Some value)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([f; Y], [(5,21--5,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
index e9ea732f51f..3768075ef94 100644
--- a/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/GetSetMemberWithInlineKeyword.fs.bsl
@@ -28,7 +28,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([x; Y], [(3,19--3,20)], [None; None]),
@@ -58,7 +58,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some y)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([x; Y], [(3,19--3,20)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl
index 37100c58ad0..ddb47eb7ecc 100644
--- a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl	
@@ -27,7 +27,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P], [(6,15--6,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl
index 28dcc0d77f9..fa0211259a4 100644
--- a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl	
@@ -27,7 +27,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P], [(6,15--6,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl
index 2fb3b66de14..332508f43f8 100644
--- a/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Interface 01.fs.bsl	
@@ -30,8 +30,7 @@ ImplFile
                                          MemberKind = Member },
                                      SynValInfo
                                        ([[SynArgInfo ([], false, None)]; []],
-                                        SynArgInfo ([], false, None)), None,
-                                     None),
+                                        SynArgInfo ([], false, None)), None),
                                   LongIdent
                                     (SynLongIdent
                                        ([this; P1], [(5,21--5,22)], [None; None]),
@@ -55,7 +54,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P2], [(7,15--7,16)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl
index 678d14abb12..2d699762c27 100644
--- a/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Interface 02.fs.bsl	
@@ -27,7 +27,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P], [(6,15--6,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl
index 9220a59883b..1394c744330 100644
--- a/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Interface 05.fs.bsl	
@@ -23,9 +23,9 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((6,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (x, None), false, None, (6,4--6,5)),
-                  None, Const (Int32 1, (6,8--6,9)), (6,4--6,5), Yes (6,0--6,9),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (x, None), false, None, (6,4--6,5)), None,
+                  Const (Int32 1, (6,8--6,9)), (6,4--6,5), Yes (6,0--6,9),
                   { LeadingKeyword = Let (6,0--6,3)
                     InlineKeyword = None
                     EqualsRange = Some (6,6--6,7) })], (6,0--6,9))],
diff --git a/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl
index 3362c7ae6e6..b92b4abc202 100644
--- a/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Interface 06.fs.bsl	
@@ -21,7 +21,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Wild (6,8--6,9), None,
+                                None), Wild (6,8--6,9), None,
                              Const (Unit, (6,12--6,14)), (6,8--6,9),
                              Yes (6,4--6,14),
                              { LeadingKeyword = Let (6,4--6,7)
diff --git a/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl
index d8120f856fd..66c618d8e44 100644
--- a/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Interface 07.fs.bsl	
@@ -27,7 +27,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P], [(6,15--6,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl
index f0e64cdad0a..301dc4c9570 100644
--- a/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Interface 08.fs.bsl	
@@ -26,7 +26,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P], [(6,15--6,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl
index 6609fd43ebb..c4071e92b4f 100644
--- a/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Let 01.fs.bsl	
@@ -18,7 +18,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Wild (5,8--5,9), None,
+                                None), Wild (5,8--5,9), None,
                              Const (Int32 1, (5,12--5,13)), (5,8--5,9),
                              Yes (5,4--5,13),
                              { LeadingKeyword = Let (5,4--5,7)
@@ -31,7 +31,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,8)), None,
+                                None), Const (Unit, (7,4--7,8)), None,
                              Const (Int32 2, (7,7--7,8)), (7,4--7,8), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl
index 2bfce8d055a..e8e2862dcc6 100644
--- a/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Let 02.fs.bsl	
@@ -18,7 +18,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Wild (5,8--5,9), None,
+                                None), Wild (5,8--5,9), None,
                              ArbitraryAfterError ("localBinding1", (5,11--5,11)),
                              (5,8--5,9), Yes (5,8--5,11),
                              { LeadingKeyword = Let (5,4--5,7)
@@ -31,7 +31,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,8)), None,
+                                None), Const (Unit, (7,4--7,8)), None,
                              Const (Int32 2, (7,7--7,8)), (7,4--7,8), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl
index 318037a56a4..01cb91bbe95 100644
--- a/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Let 03.fs.bsl	
@@ -18,7 +18,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Wild (5,8--5,9), None,
+                                None), Wild (5,8--5,9), None,
                              ArbitraryAfterError ("localBinding2", (5,9--5,9)),
                              (5,8--5,9), Yes (5,4--5,9),
                              { LeadingKeyword = Let (5,4--5,7)
@@ -30,7 +30,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,8)), None,
+                                None), Const (Unit, (7,4--7,8)), None,
                              Const (Int32 2, (7,7--7,8)), (7,4--7,8), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl
index 9414af5e257..439bf0d6cb7 100644
--- a/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Let 04.fs.bsl	
@@ -18,7 +18,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,8)), None,
+                                None), Const (Unit, (7,4--7,8)), None,
                              Const (Int32 2, (7,7--7,8)), (7,4--7,8), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl
index 46122505e0e..168769ff761 100644
--- a/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member - Attributes 01.fs.bsl	
@@ -32,7 +32,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -62,7 +62,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             FromParseError (Wild (5,16--5,16), (5,16--5,16)),
                             None,
                             ArbitraryAfterError
@@ -91,7 +91,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl
index 8ce426a8b48..432229da76f 100644
--- a/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member - Param - Missing type 01.fs.bsl	
@@ -26,7 +26,7 @@ ImplFile
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)];
                                    [SynArgInfo ([], false, Some i)]],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; M], [(4,15--4,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl
index 279fd7c19c3..e5ce844b09e 100644
--- a/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 01.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -61,7 +61,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             FromParseError (Wild (5,16--5,16), (5,16--5,16)),
                             None,
                             ArbitraryAfterError
@@ -90,7 +90,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl
index f46f4b20f5e..dc24f73a058 100644
--- a/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 02.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -61,7 +61,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             Named
                               (SynIdent (this, None), false, None, (5,17--5,21)),
                             None,
@@ -90,7 +90,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl
index e3992570b33..09fde9d81da 100644
--- a/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 03.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -61,7 +61,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             Named
                               (SynIdent (this, None), false, None, (5,17--5,21)),
                             None,
@@ -90,7 +90,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl
index f5fc86a8e89..c4bfa610f42 100644
--- a/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 04.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -61,7 +61,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P2], [(5,21--5,22)], [None; None]),
@@ -91,7 +91,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl
index 96849944218..7fdadfeebbc 100644
--- a/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 05.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -61,7 +61,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P2], [(5,21--5,22)], [None; None]),
@@ -92,7 +92,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl
index 4281a25093b..d249dd2cc26 100644
--- a/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 06.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -61,7 +61,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P2], [(5,21--5,22)], [None; None]),
@@ -91,7 +91,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl
index f3bd7b4c3af..53fff4c46e5 100644
--- a/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 07.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -61,7 +61,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             Named
                               (SynIdent (this, None), false, None, (5,17--5,21)),
                             None, Const (Int32 2, (5,25--5,26)), (5,4--5,24),
@@ -89,7 +89,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl
index 7c05186bca6..d7a7eda73ea 100644
--- a/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 08.fs.bsl	
@@ -40,7 +40,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent ([Norm], [], [None]), None, None,
                                Pats [], None, (4,42--4,46)),
diff --git a/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl
index def008304cd..e101bf1b6da 100644
--- a/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 09.fs.bsl	
@@ -30,7 +30,7 @@ ImplFile
                                    MemberKind = Member },
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]; []],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          FromParseError (Wild (6,10--6,10), (6,10--6,10)), None,
                          ArbitraryAfterError ("classDefnMember1", (6,10--6,10)),
                          (6,4--6,10), NoneAtInvisible,
diff --git a/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl
index 05c75ad23db..5749df6a18b 100644
--- a/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 10.fs.bsl	
@@ -30,7 +30,7 @@ ImplFile
                                    MemberKind = Member },
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]; []],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          Wild (6,11--6,12), None,
                          ArbitraryAfterError ("memberCore2", (6,12--6,12)),
                          (6,11--6,12), NoneAtInvisible,
diff --git a/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl
index 75ab7ee9c3b..a4d4b985c40 100644
--- a/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 11.fs.bsl	
@@ -30,7 +30,7 @@ ImplFile
                                    MemberKind = Member },
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]; []],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          FromParseError (Wild (6,10--6,10), (6,10--6,10)), None,
                          ArbitraryAfterError ("classDefnMember1", (6,10--6,10)),
                          (6,4--6,10), NoneAtInvisible,
diff --git a/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl b/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl
index 3be2115d72b..c20d46b6107 100644
--- a/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Member 12.fs.bsl	
@@ -24,7 +24,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             Named
                               (SynIdent (this, None), false, None, (4,11--4,15)),
                             None,
diff --git a/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
index 9605b1d963d..7db3831e689 100644
--- a/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/MemberWithInlineKeyword.fs.bsl
@@ -25,7 +25,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([x; Y], [(3,19--3,20)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index 75093da5d18..780fb23542d 100644
--- a/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/Read-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -35,7 +35,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadProperty], [(5,15--5,16)],
diff --git a/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index 111fa67994d..a4240a8a27e 100644
--- a/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/ReadwritePropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -36,7 +36,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty], [(4,15--4,16)],
@@ -66,7 +66,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some value)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyReadWriteProperty], [(4,15--4,16)],
diff --git a/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl
index 922474498b9..7c47ccf95ec 100644
--- a/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Static 01.fs.bsl	
@@ -23,7 +23,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Member },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             FromParseError (Wild (5,10--5,10), (5,10--5,10)),
                             None,
                             ArbitraryAfterError
@@ -38,7 +38,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None), Const (Unit, (7,4--7,9)), None,
+                                None), Const (Unit, (7,4--7,9)), None,
                              Const (Unit, (7,7--7,9)), (7,4--7,9), NoneAtDo,
                              { LeadingKeyword = Do (7,4--7,6)
                                InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl
index 573810665d3..ecf86c4e1f6 100644
--- a/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Static 02.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -60,7 +60,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Member },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             FromParseError (Wild (5,16--5,16), (5,16--5,16)),
                             None,
                             ArbitraryAfterError
@@ -89,7 +89,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl
index 1c24fc16c45..70d5eb3aba9 100644
--- a/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Member/Static 03.fs.bsl	
@@ -31,7 +31,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P1], [(4,21--4,22)], [None; None]),
@@ -60,7 +60,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Member },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             FromParseError (Wild (5,23--5,23), (5,23--5,23)),
                             None,
                             ArbitraryAfterError
@@ -90,7 +90,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P3], [(6,21--6,22)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
index 94215d632b7..b09a60eed84 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithGetHasXmlComment.fs.bsl
@@ -28,7 +28,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([x; B], [(4,12--4,13)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
index 758f4c71869..85520b1de87 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithMemberWithSetget.fs.bsl
@@ -32,7 +32,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; Z], [(3,15--3,16)], [None; None]),
@@ -70,7 +70,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, None)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; Z], [(3,15--3,16)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
index aebdd9f9899..7749a9c5784 100644
--- a/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/SynTypeDefnWithStaticMemberWithGetset.fs.bsl
@@ -27,8 +27,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = PropertyGet },
                                   SynValInfo
-                                    ([[]], SynArgInfo ([], false, None)), None,
-                                  None),
+                                    ([[]], SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent ([ReadWrite2], [], [None]),
                                   Some get, None,
@@ -72,7 +71,7 @@ ImplFile
                                       MemberKind = PropertySet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, Some x)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent ([ReadWrite2], [], [None]),
                                   Some set, None,
diff --git a/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
index 6bd42447bb0..9dad153789c 100644
--- a/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Member/Write-onlyPropertyInSynMemberDefnMemberContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -37,7 +37,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some value)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([this; MyWriteOnlyProperty], [(5,15--5,16)],
diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
index 3bc8833d05f..cb73ae7b1dd 100644
--- a/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynExprObjMembersHaveCorrectKeywords.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (meh, None), false, None, (2,4--2,7)), None,
                   ObjExpr
                     (LongIdent (SynLongIdent ([Interface], [], [None])), None,
@@ -29,7 +28,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; Foo], [(4,21--4,22)], [None; None]),
@@ -56,7 +55,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; Bar], [(5,19--5,20)], [None; None]),
@@ -87,7 +86,7 @@ ImplFile
                                        MemberKind = Member },
                                    SynValInfo
                                      ([[SynArgInfo ([], false, None)]; []],
-                                      SynArgInfo ([], false, None)), None, None),
+                                      SynArgInfo ([], false, None)), None),
                                 LongIdent
                                   (SynLongIdent
                                      ([this; Blah], [(7,19--7,20)], [None; None]),
diff --git a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
index febd91b1809..ae8cfbaa083 100644
--- a/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/MemberFlag/SynMemberDefnMemberSynValDataHasCorrectKeyword.fs.bsl
@@ -25,7 +25,7 @@ ImplFile
                                       GetterOrSetterIsCompilerGenerated = false
                                       MemberKind = Member },
                                SynValInfo ([[]], SynArgInfo ([], false, None)),
-                               None, None),
+                               None),
                             LongIdent
                               (SynLongIdent
                                  ([this; B], [(3,22--3,23)], [None; None]), None,
@@ -53,7 +53,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; A], [(4,15--4,16)], [None; None]), None,
@@ -80,7 +80,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; C], [(5,17--5,18)], [None; None]), None,
@@ -107,7 +107,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; D], [(6,16--6,17)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl
index 32218facf9d..92101cded07 100644
--- a/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/ModuleMember/Let 01.fs.bsl	
@@ -9,11 +9,11 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None, Const (Int32 1, (3,8--3,9)),
-                  (3,4--3,5), Yes (3,0--3,9), { LeadingKeyword = Let (3,0--3,3)
-                                                InlineKeyword = None
-                                                EqualsRange = Some (3,6--3,7) })],
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None, Const (Int32 1, (3,8--3,9)), (3,4--3,5),
+                  Yes (3,0--3,9), { LeadingKeyword = Let (3,0--3,3)
+                                    InlineKeyword = None
+                                    EqualsRange = Some (3,6--3,7) })],
               (3,0--3,9)); Expr (Const (Int32 2, (5,0--5,1)), (5,0--5,1))],
           PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
           (1,0--5,1), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl
index 47ece6a2734..cfa14a90cd0 100644
--- a/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/ModuleMember/Let 02.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   ArbitraryAfterError ("localBinding1", (3,7--3,7)), (3,4--3,5),
                   Yes (3,4--3,7), { LeadingKeyword = Let (3,0--3,3)
                                     InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl b/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl
index 1e03a9a4aee..374a64bda0e 100644
--- a/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/ModuleMember/Let 03.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5), None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5), None,
                   ArbitraryAfterError ("localBinding2", (3,5--3,5)), (3,4--3,5),
                   Yes (3,0--3,5), { LeadingKeyword = Let (3,0--3,3)
                                     InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl
index f355498ea38..70ca7f64fdb 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/Module - Attribute 01.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (s, None), false, None, (5,4--5,5)),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (s, None), false, None, (5,4--5,5)),
                   Some
                     (SynBindingReturnInfo
                        (LongIdent (SynLongIdent ([string], [], [None])),
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
index 7d23c20dd87..7e55d2eb57d 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/ModuleShouldContainModuleKeyword.fs.bsl
@@ -37,7 +37,7 @@ ImplFile
                       PreXmlDoc ((13,4), FSharp.Compiler.Xml.XmlDocCollector),
                       SynValData
                         (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                         None, None),
+                         None),
                       Named (SynIdent (a, None), false, None, (13,8--13,9)),
                       None, Const (Int32 42, (13,12--13,14)), (13,8--13,9),
                       Yes (13,4--13,14), { LeadingKeyword = Let (13,4--13,7)
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
index 8a8ce626058..09880fab704 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/MultipleDeclaredNamespacesShouldHaveARangeThatStartsAtTheNamespaceKeyword.fs.bsl
@@ -26,13 +26,13 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((9,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (x, None), false, None, (9,4--9,5)),
-                  None, Const (Int32 42, (9,8--9,10)), (9,4--9,5),
-                  Yes (9,0--9,10), { LeadingKeyword = Let (9,0--9,3)
-                                     InlineKeyword = None
-                                     EqualsRange = Some (9,6--9,7) })],
-              (9,0--9,10))], PreXmlDocEmpty, [], None, (7,0--9,10),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (x, None), false, None, (9,4--9,5)), None,
+                  Const (Int32 42, (9,8--9,10)), (9,4--9,5), Yes (9,0--9,10),
+                  { LeadingKeyword = Let (9,0--9,3)
+                    InlineKeyword = None
+                    EqualsRange = Some (9,6--9,7) })], (9,0--9,10))],
+          PreXmlDocEmpty, [], None, (7,0--9,10),
           { LeadingKeyword = Namespace (7,0--7,9) })], (true, true),
       { ConditionalDirectives = []
         CodeComments = [] }, set []))
diff --git a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
index 74a0eeb68b3..fddeeca8a03 100644
--- a/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/ModuleOrNamespace/NamespaceShouldContainNamespaceKeyword.fs.bsl
@@ -16,7 +16,7 @@ ImplFile
                       PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                       SynValData
                         (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                         None, None),
+                         None),
                       Named (SynIdent (a, None), false, None, (4,8--4,9)), None,
                       Const (Int32 42, (4,12--4,14)), (4,8--4,9),
                       Yes (4,4--4,14), { LeadingKeyword = Let (4,4--4,7)
diff --git a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl
index c71da6394f7..24837f66d09 100644
--- a/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl
+++ b/tests/service/data/SyntaxTree/NestedModule/NestedModuleWithBeginEndAndDecls.fs.bsl
@@ -16,7 +16,7 @@ ImplFile
                       PreXmlDoc ((5,8), FSharp.Compiler.Xml.XmlDocCollector),
                       SynValData
                         (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                         None, None),
+                         None),
                       Named (SynIdent (a, None), false, None, (5,12--5,13)),
                       None, Const (Int32 0, (5,16--5,17)), (5,12--5,13),
                       Yes (5,8--5,17), { LeadingKeyword = Let (5,8--5,11)
diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
index 68e8852f406..9741e505625 100644
--- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternDefinition.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some a)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent
                        ([|Odd|Even|], [],
diff --git a/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
index af805042dc3..f78ea9234b9 100644
--- a/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ActivePatternIdentifierInPrivateMember.fs.bsl
@@ -29,7 +29,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([_; |A'|], [(3,20--3,21)],
diff --git a/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
index 66eff420883..33ebeafb08c 100644
--- a/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/CustomOperatorDefinition.fs.bsl
@@ -14,7 +14,7 @@ ImplFile
                      SynValInfo
                        ([[SynArgInfo ([], false, Some a)];
                          [SynArgInfo ([], false, Some b)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent
                        ([op_Addition], [],
diff --git a/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
index ffc9b620fc5..2679d87a302 100644
--- a/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/ObjectModelWithTwoMembers.fs.bsl
@@ -23,7 +23,7 @@ ImplFile
                              SynValData
                                (None,
                                 SynValInfo ([], SynArgInfo ([], false, None)),
-                                None, None),
+                                None),
                              Named
                                (SynIdent (allowInto, None), false, None,
                                 (3,16--3,25)), None,
@@ -49,7 +49,7 @@ ImplFile
                                       MemberKind = PropertyGet },
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)]; []],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([_; AllowIntoPattern], [(4,12--4,13)],
@@ -78,7 +78,7 @@ ImplFile
                                   SynValInfo
                                     ([[SynArgInfo ([], false, None)];
                                       [SynArgInfo ([], false, Some v)]],
-                                     SynArgInfo ([], false, None)), None, None),
+                                     SynArgInfo ([], false, None)), None),
                                LongIdent
                                  (SynLongIdent
                                     ([_; AllowIntoPattern], [(4,12--4,13)],
diff --git a/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
index 04bb473c54a..4e05d9cbd83 100644
--- a/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/OperatorInMemberDefinition.fs.bsl
@@ -26,7 +26,7 @@ ImplFile
                               ([[SynArgInfo ([], false, None)];
                                 [SynArgInfo ([], false, Some a)];
                                 [SynArgInfo ([], false, Some b)]],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          LongIdent
                            (SynLongIdent
                               ([_; op_Addition], [(3,12--3,13)],
diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
index c1771818f8b..6b6c5b59524 100644
--- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinition.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some a)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent
                        ([|Int32Const|_|], [],
diff --git a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
index 9974f43258d..62cede07065 100644
--- a/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/PartialActivePatternDefinitionWithoutParameters.fs.bsl
@@ -11,8 +11,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named
                     (SynIdent
                        (|Boolean|_|,
diff --git a/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
index d82db251b45..b83fc4ecf68 100644
--- a/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
+++ b/tests/service/data/SyntaxTree/OperatorName/QualifiedOperatorExpression.fs.bsl
@@ -14,7 +14,7 @@ ImplFile
                      SynValInfo
                        ([[SynArgInfo ([], false, Some x)];
                          [SynArgInfo ([], false, Some n)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([PowByte], [], [None]), None, None,
                      Pats
diff --git a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
index c88aa97f9e5..d159480e120 100644
--- a/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/InHeadPattern.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   ListCons
                     (Const (Int32 1, (2,4--2,5)), Wild (2,9--2,10), (2,4--2,10),
                      { ColonColonRange = (2,6--2,8) }), None,
diff --git a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
index 772e5763b7b..f95f9ac0334 100644
--- a/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
+++ b/tests/service/data/SyntaxTree/Pattern/OperatorInSynPatLongIdent.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (ListCons
                        (Named (SynIdent (head, None), false, None, (2,5--2,9)),
diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl
index 49176464752..a81579964af 100644
--- a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 01.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Tuple
                     (false,
                      [Named (SynIdent (a, None), false, None, (3,4--3,5));
@@ -28,8 +27,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (Tuple
                        (false,
diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl
index 5787f8fba0e..61bc7ef99b7 100644
--- a/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Tuple - HeadPat 02.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (Tuple
                        (false,
diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl
index 95eeeda6903..ed30e1a4690 100644
--- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 01.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Tuple
                     (false,
                      [Named (SynIdent (a, None), false, None, (3,4--3,5));
diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl
index 3182312abeb..5a07aa0debc 100644
--- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 02.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Tuple
                     (false,
                      [Named (SynIdent (a, None), false, None, (3,4--3,5));
diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl
index 491ae0e06ba..ada6c9b8de0 100644
--- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 03.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (Tuple
                        (true,
@@ -31,8 +30,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((4,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (Tuple
                        (true,
diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl
index 3380d6299ac..98ed45e9cfd 100644
--- a/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Recover 04.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Tuple
                     (false,
                      [Wild (3,4--3,4);
@@ -28,8 +27,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((5,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Tuple
                     (false,
                      [Paren
@@ -46,8 +44,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((7,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Tuple
                     (false, [Wild (7,4--7,4); Wild (7,5--7,5)], [(7,4--7,5)],
                      (7,4--7,7)), None, Const (Unit, (7,8--7,10)), (7,4--7,7),
diff --git a/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl
index 760f891de02..0b605142320 100644
--- a/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Tuple - Struct 01.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (Tuple
                        (true,
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl
index 68dfb1fb5b7..da447d5434b 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 01.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (i, None), false, None, (3,4--3,5)),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (i, None), false, None, (3,4--3,5)),
                   Some
                     (SynBindingReturnInfo
                        (FromParseError (3,6--3,6), (3,6--3,6), [],
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl
index c263d499c74..b5b4b6e28e2 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 02.fs.bsl	
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (i, None), false, None, (3,4--3,5)),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (i, None), false, None, (3,4--3,5)),
                   Some
                     (SynBindingReturnInfo
                        (FromParseError (3,6--3,6), (3,6--3,6), [],
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl
index 54a87b2f970..609bc09a6fe 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 03.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (As
                        (Paren
diff --git a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl
index 00f74ec1bd4..6ac283f7a93 100644
--- a/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Pattern/Typed - Missing type 04.fs.bsl	
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Paren
                     (As
                        (Typed
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 761c74868f1..89f2ca602eb 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	
@@ -15,7 +15,7 @@ ImplFile
                            SynValData
                              (None,
                               SynValInfo ([], SynArgInfo ([], false, None)),
-                              None, None),
+                              None),
                            Named (SynIdent (i, None), false, None, (4,8--4,9)),
                            Some
                              (SynBindingReturnInfo
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 b5f3cef6204..55a07b60288 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	
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Named (SynIdent (i, None), false, None, (4,8--4,9)),
                         Some
                           (SynBindingReturnInfo
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 f86915928d7..89a4af5ce5c 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	
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Paren
                           (Typed
                              (Named
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 cc64cf0ff2c..f3fa83db96a 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	
@@ -13,7 +13,7 @@ ImplFile
                         PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
                         SynValData
                           (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                           None, None),
+                           None),
                         Paren
                           (Typed
                              (Named
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 c17b183fe8b..e89431a48e0 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	
@@ -15,7 +15,7 @@ ImplFile
                           (None,
                            SynValInfo
                              ([[SynArgInfo ([], false, Some i)]],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent ([f], [], [None]), None, None,
                            Pats
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 b21fcb2524a..97ad7191e25 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	
@@ -16,7 +16,7 @@ ImplFile
                            SynValInfo
                              ([[SynArgInfo ([], false, Some i);
                                 SynArgInfo ([], false, Some j)]],
-                              SynArgInfo ([], false, None)), None, None),
+                              SynArgInfo ([], false, None)), None),
                         LongIdent
                           (SynLongIdent ([f], [], [None]), None, None,
                            Pats
diff --git a/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl b/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl
index a8830c9d599..9f74ed36236 100644
--- a/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SimplePats/SimplePats - Recover 01.fs.bsl	
@@ -14,7 +14,7 @@ ImplFile
                      SynValInfo
                        ([[SynArgInfo ([], false, Some i);
                           SynArgInfo ([], false, None)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   Named (SynIdent (x, None), false, None, (3,4--3,5)), None,
                   Lambda
                     (false, false,
@@ -52,7 +52,7 @@ ImplFile
                        ([[SynArgInfo ([], false, Some a);
                           SynArgInfo ([], false, Some b);
                           SynArgInfo ([], false, None)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   Named (SynIdent (y, None), false, None, (4,4--4,5)), None,
                   Lambda
                     (false, false,
@@ -102,7 +102,7 @@ ImplFile
                                     Range = (5,28--5,31) }]
                                 Range = (5,26--5,33) }], false, Some v);
                           SynArgInfo ([], false, None)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   Named (SynIdent (z, None), false, None, (5,4--5,5)), None,
                   Lambda
                     (false, false,
@@ -179,7 +179,7 @@ ImplFile
                      SynValInfo
                        ([[SynArgInfo ([], false, None);
                           SynArgInfo ([], false, None)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   Named (SynIdent (ignore, None), false, None, (6,4--6,10)),
                   None,
                   Lambda
diff --git a/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl b/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl
index 66b71da8a34..512fa280b98 100644
--- a/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SimplePats/SimplePats 01.fs.bsl	
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some i)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   Named (SynIdent (x, None), false, None, (3,4--3,5)), None,
                   Lambda
                     (false, false,
@@ -44,7 +44,7 @@ ImplFile
                      SynValInfo
                        ([[SynArgInfo ([], false, Some a);
                           SynArgInfo ([], false, Some b)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   Named (SynIdent (y, None), false, None, (4,4--4,5)), None,
                   Lambda
                     (false, false,
@@ -91,7 +91,7 @@ ImplFile
                                     AppliesToGetterAndSetter = false
                                     Range = (5,28--5,31) }]
                                 Range = (5,26--5,33) }], false, Some v)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   Named (SynIdent (z, None), false, None, (5,4--5,5)), None,
                   Lambda
                     (false, false,
@@ -165,7 +165,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, None)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   Named (SynIdent (ignore, None), false, None, (6,4--6,10)),
                   None,
                   Lambda
@@ -185,8 +185,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((7,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (empty, None), false, None, (7,4--7,9)), None,
                   Lambda
                     (false, false, SimplePats ([], [], (7,16--7,18)),
diff --git a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl
index 61e9f04fd1f..7e6563219a6 100644
--- a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInModule.fs.bsl
@@ -16,7 +16,7 @@ ImplFile
                       PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
                       SynValData
                         (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                         None, None),
+                         None),
                       Named (SynIdent (b, None), false, None, (2,8--2,9)), None,
                       InterpolatedString
                         ([String ("
diff --git a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl
index 20150b3d0c0..d91bffd331d 100644
--- a/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/InterpolatedStringOffsideInNestedLet.fs.bsl
@@ -10,9 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (a, None), false, None, (1,4--1,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (a, None), false, None, (1,4--1,5)), None,
                   LetOrUse
                     (false, false,
                      [SynBinding
@@ -20,7 +19,7 @@ ImplFile
                          PreXmlDoc ((2,4), FSharp.Compiler.Xml.XmlDocCollector),
                          SynValData
                            (None, SynValInfo ([], SynArgInfo ([], false, None)),
-                            None, None),
+                            None),
                          Named (SynIdent (b, None), false, None, (2,8--2,9)),
                          None,
                          InterpolatedString
diff --git a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
index 66827cfe575..be0c3ae5c30 100644
--- a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindRegular.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (bytes, None), false, None, (2,4--2,9)), None,
                   Const
                     (Bytes ([|121uy; 111uy|], Regular, (2,12--2,17)),
diff --git a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
index 6df6f970119..178873fb61e 100644
--- a/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstBytesWithSynByteStringKindVerbatim.fs.bsl
@@ -10,8 +10,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (bytes, None), false, None, (2,4--2,9)), None,
                   Const
                     (Bytes ([|121uy; 111uy|], Verbatim, (2,12--2,18)),
diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
index ffa12576b1c..aaba1c57606 100644
--- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindRegular.fs.bsl
@@ -10,9 +10,9 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (s, None), false, None, (2,4--2,5)),
-                  None, Const (String ("yo", Regular, (2,8--2,12)), (2,8--2,12)),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (s, None), false, None, (2,4--2,5)), None,
+                  Const (String ("yo", Regular, (2,8--2,12)), (2,8--2,12)),
                   (2,4--2,5), Yes (2,0--2,12), { LeadingKeyword = Let (2,0--2,3)
                                                  InlineKeyword = None
                                                  EqualsRange = Some (2,6--2,7) })],
diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
index e6ecdaa5456..2ad18580156 100644
--- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindTripleQuote.fs.bsl
@@ -10,9 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (s, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (s, None), false, None, (2,4--2,5)), None,
                   Const (String ("yo", TripleQuote, (2,8--2,16)), (2,8--2,16)),
                   (2,4--2,5), Yes (2,0--2,16), { LeadingKeyword = Let (2,0--2,3)
                                                  InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
index 6586515cb4b..2bbac831810 100644
--- a/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynConstStringWithSynStringKindVerbatim.fs.bsl
@@ -10,9 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (s, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (s, None), false, None, (2,4--2,5)), None,
                   Const (String ("yo", Verbatim, (2,8--2,13)), (2,8--2,13)),
                   (2,4--2,5), Yes (2,0--2,13), { LeadingKeyword = Let (2,0--2,3)
                                                  InlineKeyword = None
diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
index 3e20d1d43ff..601a0e5e9da 100644
--- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindRegular.fs.bsl
@@ -11,9 +11,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (s, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (s, None), false, None, (2,4--2,5)), None,
                   InterpolatedString
                     ([String ("yo ", (2,8--2,14));
                       FillExpr (Const (Int32 42, (2,14--2,16)), None);
diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
index 34a85e88407..8eafe3c8745 100644
--- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindTripleQuote.fs.bsl
@@ -13,9 +13,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (s, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (s, None), false, None, (2,4--2,5)), None,
                   InterpolatedString
                     ([String ("yo ", (2,8--2,16));
                       FillExpr (Const (Int32 42, (2,16--2,18)), None);
diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
index 212c5a6e384..486b527607a 100644
--- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithSynStringKindVerbatim.fs.bsl
@@ -13,9 +13,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (s, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (s, None), false, None, (2,4--2,5)), None,
                   InterpolatedString
                     ([String ("Migrate notes of file "", (2,8--2,36));
                       FillExpr (Ident oldId, None);
diff --git a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl
index 8df990ce9c0..8fbc4d9d76c 100644
--- a/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl
+++ b/tests/service/data/SyntaxTree/String/SynExprInterpolatedStringWithTripleQuoteMultipleDollars.fs.bsl
@@ -13,9 +13,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (s, None), false, None, (2,4--2,5)),
-                  None,
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (s, None), false, None, (2,4--2,5)), None,
                   InterpolatedString
                     ([String ("1 + ", (2,8--2,21));
                       FillExpr (Const (Int32 41, (2,21--2,23)), None);
diff --git a/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl b/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl
index bc10e55147e..96d2a16e16c 100644
--- a/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynTyparDecl/Constraint intersection 01.fs.bsl	
@@ -62,7 +62,7 @@ ImplFile
                                  ([[SynArgInfo ([], false, None)];
                                    [SynArgInfo ([], false, Some x);
                                     SynArgInfo ([], false, Some y)]],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([_; G], [(4,12--4,13)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl b/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl
index 937da0bbbad..64e8fd7c7a8 100644
--- a/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Constraint intersection 01.fs.bsl	
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some f)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([y], [], [None]), None, None,
                      Pats
diff --git a/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl b/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl
index 443d1b2c50b..039915cb522 100644
--- a/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Constraint intersection 02.fs.bsl	
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some f)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([y], [], [None]), None, None,
                      Pats
diff --git a/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl
index b81dac6c95c..79fba7f21d4 100644
--- a/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Fun 06.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl
index 13ea6abd7b4..fc09b3f737f 100644
--- a/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Fun 07.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl
index 4d18b66affd..914be23e3c5 100644
--- a/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Fun 08.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl
index e0a19b95ecf..3a7ecdba3cf 100644
--- a/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Fun 09.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl b/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl
index 5c7ab73a05d..061982252ad 100644
--- a/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Fun 10.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
index f617178cedc..7782c254288 100644
--- a/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/NestedSynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some x)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent
                        ([op_BangBang], [],
diff --git a/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
index d38d69d615a..9ed3e51aa43 100644
--- a/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SingleSynTypeInsideSynExprTraitCall.fs.bsl
@@ -26,7 +26,7 @@ ImplFile
                                SynValInfo
                                  ([[SynArgInfo ([], false, Some a);
                                     SynArgInfo ([], false, Some f)]],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent ([replace], [], [None]), None,
                                Some
diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
index b17ef02e715..370e07d5746 100644
--- a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynExprTraitCall.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some x)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent
                        ([op_BangBang], [],
diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
index d346406068e..5b687420cb8 100644
--- a/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrInsideSynTypeConstraintWhereTyparSupportsMember.fs.bsl
@@ -13,8 +13,7 @@ ImplFile
                  (None, Normal, true, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([[]], SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([f_StaticMethod], [], [None]), None,
                      Some
diff --git a/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
index 76496719abe..0ee54488a53 100644
--- a/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
+++ b/tests/service/data/SyntaxTree/SynType/SynTypeOrWithAppTypeOnTheRightHandSide.fs.bsl
@@ -13,7 +13,7 @@ ImplFile
                     (None,
                      SynValInfo
                        ([[SynArgInfo ([], false, Some x)]],
-                        SynArgInfo ([], false, None)), None, None),
+                        SynArgInfo ([], false, None)), None),
                   LongIdent
                     (SynLongIdent ([f], [], [None]), None, None,
                      Pats
diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl
index 81cef2eb1a5..c0d052bcc9f 100644
--- a/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Tuple 09.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl
index 7c4d54985d6..dc553f72214 100644
--- a/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Tuple 10.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl
index 9533d03d933..31ca0e7d595 100644
--- a/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Tuple 11.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl
index 53d7860de8a..48dd1654f53 100644
--- a/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Tuple 12.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl
index be79c42ae15..1c4baa1ad5b 100644
--- a/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Tuple 13.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl b/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl
index 3dd20696d2f..8f40539042b 100644
--- a/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl	
+++ b/tests/service/data/SyntaxTree/SynType/Tuple 14.fs.bsl	
@@ -9,8 +9,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (3,4--3,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (3,4--3,5),
                   Some
                     (SynBindingReturnInfo
                        (Fun
diff --git a/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl
index 951bc97fc0b..f7e959d10a0 100644
--- a/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Type/Class 02.fs.bsl	
@@ -24,7 +24,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P], [(5,19--5,20)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl
index 9d22a74e529..91d5f58ca56 100644
--- a/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Type/Record 01.fs.bsl	
@@ -31,8 +31,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((9,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (meh, None), false, None, (9,4--9,7)), None,
                   Const (Unit, (9,10--9,12)), (9,4--9,7), Yes (9,0--9,12),
                   { LeadingKeyword = Let (9,0--9,3)
diff --git a/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl b/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl
index 9d61bce8323..3ebdfe18ae4 100644
--- a/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Type/Record 02.fs.bsl	
@@ -32,8 +32,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((9,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (meh, None), false, None, (9,4--9,7)), None,
                   Const (Unit, (9,10--9,12)), (9,4--9,7), Yes (9,0--9,12),
                   { LeadingKeyword = Let (9,0--9,3)
diff --git a/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
index 5cd03c597aa..ed20d359009 100644
--- a/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynMemberDefnInterfaceContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -38,8 +38,7 @@ ImplFile
                                          MemberKind = Member },
                                      SynValInfo
                                        ([[SynArgInfo ([], false, None)]; []],
-                                        SynArgInfo ([], false, None)), None,
-                                     None),
+                                        SynArgInfo ([], false, None)), None),
                                   LongIdent
                                     (SynLongIdent ([Meh], [], [None]), None,
                                      None,
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
index f273c8c5690..285ecf0975e 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithAugmentationContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -27,7 +27,7 @@ ImplFile
                                    MemberKind = Member },
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]; []],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          LongIdent
                            (SynLongIdent
                               ([_; Zero], [(3,12--3,13)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
index 424aac50850..41f5400ce1a 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeDefnWithRecordContainsTheRangeOfTheWithKeyword.fs.bsl
@@ -36,7 +36,7 @@ ImplFile
                             SynValInfo
                               ([[SynArgInfo ([], false, None)];
                                 [SynArgInfo ([], false, Some v)]],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          LongIdent
                            (SynLongIdent
                               ([this; Meh], [(5,19--5,20)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
index 07ff7d74576..e0f51c6ee46 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStruct.fs.bsl
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (2,4--2,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (2,4--2,5),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
diff --git a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
index 6d6179cbd3e..c69d94938c8 100644
--- a/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
+++ b/tests/service/data/SyntaxTree/Type/SynTypeTupleWithStructRecovery.fs.bsl
@@ -10,8 +10,8 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((2,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Wild (2,4--2,5),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Wild (2,4--2,5),
                   Some
                     (SynBindingReturnInfo
                        (Tuple
diff --git a/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl
index 59012668b75..0eb812102a6 100644
--- a/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Type/Type 07.fs.bsl	
@@ -24,7 +24,7 @@ ImplFile
                                       MemberKind = Member },
                                SynValInfo
                                  ([[SynArgInfo ([], false, None)]; []],
-                                  SynArgInfo ([], false, None)), None, None),
+                                  SynArgInfo ([], false, None)), None),
                             LongIdent
                               (SynLongIdent
                                  ([this; P], [(4,15--4,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl b/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl
index 920010d29d4..979759d4dbf 100644
--- a/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Type/Type 10.fs.bsl	
@@ -29,8 +29,7 @@ ImplFile
                                        GetterOrSetterIsCompilerGenerated = false
                                        MemberKind = Member },
                                    SynValInfo
-                                     ([[]], SynArgInfo ([], false, None)), None,
-                                   None),
+                                     ([[]], SynArgInfo ([], false, None)), None),
                                 LongIdent
                                   (SynLongIdent ([M], [], [None]), None, None,
                                    Pats
diff --git a/tests/service/data/SyntaxTree/Type/With 01.fs.bsl b/tests/service/data/SyntaxTree/Type/With 01.fs.bsl
index 160d04dec6a..7fd1e7479f6 100644
--- a/tests/service/data/SyntaxTree/Type/With 01.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Type/With 01.fs.bsl	
@@ -23,7 +23,7 @@ ImplFile
                                    MemberKind = Member },
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]; []],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          LongIdent
                            (SynLongIdent
                               ([this; P], [(4,15--4,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/Type/With 04.fs.bsl b/tests/service/data/SyntaxTree/Type/With 04.fs.bsl
index b2715532783..99ddf674425 100644
--- a/tests/service/data/SyntaxTree/Type/With 04.fs.bsl	
+++ b/tests/service/data/SyntaxTree/Type/With 04.fs.bsl	
@@ -30,7 +30,7 @@ ImplFile
                                    MemberKind = Member },
                             SynValInfo
                               ([[SynArgInfo ([], false, None)]; []],
-                               SynArgInfo ([], false, None)), None, None),
+                               SynArgInfo ([], false, None)), None),
                          LongIdent
                            (SynLongIdent
                               ([this; P], [(6,15--6,16)], [None; None]), None,
diff --git a/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl b/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl
index bacab6c3a26..61ef3fc7998 100644
--- a/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl	
+++ b/tests/service/data/SyntaxTree/UnionCase/Missing keyword of.fs.bsl	
@@ -10,9 +10,9 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None), Named (SynIdent (a, None), false, None, (3,4--3,5)),
-                  None, Const (Unit, (3,8--3,10)), (3,4--3,5), Yes (3,0--3,10),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
+                  Named (SynIdent (a, None), false, None, (3,4--3,5)), None,
+                  Const (Unit, (3,8--3,10)), (3,4--3,5), Yes (3,0--3,10),
                   { LeadingKeyword = Let (3,0--3,3)
                     InlineKeyword = None
                     EqualsRange = Some (3,6--3,7) })], (3,0--3,10));
@@ -71,8 +71,7 @@ ImplFile
                  (None, Normal, false, false, [],
                   PreXmlDoc ((11,0), FSharp.Compiler.Xml.XmlDocCollector),
                   SynValData
-                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None,
-                     None),
+                    (None, SynValInfo ([], SynArgInfo ([], false, None)), None),
                   Named (SynIdent (b, None), false, None, (11,4--11,5)), None,
                   Const (Unit, (11,8--11,10)), (11,4--11,5), Yes (11,0--11,10),
                   { LeadingKeyword = Let (11,0--11,3)
diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs
index 48b5a98e032..ed89e611726 100644
--- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs
+++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.GotoDefinition.fs
@@ -560,12 +560,12 @@ type UsingMSBuild()  =
     [<Test>]
     member this.``GotoDefinition.OverloadResolutionForProperties``() =
         let lines = [ "type D() ="
-                      "  member this.Foo"
-                      "    with #1##2#get(i:int) = 1"
+                      "  member this.#1##2#Foo"
+                      "    with get(i:int) = 1"
                       "    and set (i:int) v = ()"
                       ""
-                      "  member this.Foo"
-                      "    with #3##4#get (s:string) = 1"
+                      "  member this.#3##4#Foo"
+                      "    with get (s:string) = 1"
                       "    and  set (s:string) v = ()"
                       ""
                       "D().$1$Foo 1"