diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/TexlFunction.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/TexlFunction.cs
index ed750ecb85..de9fe1c240 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Functions/TexlFunction.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Functions/TexlFunction.cs
@@ -181,9 +181,6 @@ internal abstract class TexlFunction : IFunction
         // Return true if this function can return a type with ExpandInfo.
         public virtual bool CanReturnExpandInfo => false;
 
-        // Return true if this function requires error context info.
-        public virtual bool RequiresErrorContext => false;
-
         // Return true if this function requires binding context info.
         public virtual bool RequiresBindingContext => false;
 
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Acos.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Acos.cs
index ee4897b5c1..972cab0369 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Acos.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Acos.cs
@@ -4,14 +4,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Acos(number:n)
     // Equivalent Excel function: acos
     internal sealed class AcosFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AcosFunction()
             : base("Acos", TexlStrings.AboutAcos, FunctionCategories.MathAndStat)
         {
@@ -22,11 +23,12 @@ public AcosFunction()
     // Table overload that computes the arc cosine of each item in the input table.
     internal sealed class AcosTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AcosTableFunction()
             : base("Acos", TexlStrings.AboutAcosT, FunctionCategories.Table)
         {
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Acot.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Acot.cs
index 4d92255821..b43b12e242 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Acot.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Acot.cs
@@ -4,14 +4,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Acot(number:n)
     // Equivalent Excel function: Acot
     internal sealed class AcotFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AcotFunction()
             : base("Acot", TexlStrings.AboutAcot, FunctionCategories.MathAndStat)
         {
@@ -22,11 +23,12 @@ public AcotFunction()
     // Table overload that computes the arc cotangent of each item in the input table.
     internal sealed class AcotTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AcotTableFunction()
             : base("Acot", TexlStrings.AboutAcotT, FunctionCategories.Table)
         {
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AddColumns.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AddColumns.cs
index 4f4f08b6af..9dc7b0c8e2 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AddColumns.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AddColumns.cs
@@ -12,6 +12,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // AddColumns(source:*[...], name:s, valueFunc:func<_>, name:s, valueFunc:func<_>, ...)
@@ -182,3 +185,6 @@ public override bool AllowsRowScopedParamDelegationExempted(int index)
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AsType.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AsType.cs
index 2e737fa2aa..05c88d0ab5 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AsType.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AsType.cs
@@ -14,6 +14,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // AsType(record:P, table:*[]): ![]
@@ -21,8 +24,6 @@ internal sealed class AsTypeFunction : BuiltinFunction
     {
         public const string AsTypeInvariantFunctionName = "AsType";
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsAsync => true;
 
         public override bool CanReturnExpandInfo => true;
@@ -104,3 +105,6 @@ protected override bool RequiresPagedDataForParamCore(TexlNode[] args, int param
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Asin.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Asin.cs
index 1763f04de5..9c9f4ac0ff 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Asin.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Asin.cs
@@ -4,14 +4,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Asin(number:n)
     // Equivalent Excel function: Asin
     internal sealed class AsinFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AsinFunction()
             : base("Asin", TexlStrings.AboutAsin, FunctionCategories.MathAndStat)
         {
@@ -22,11 +23,12 @@ public AsinFunction()
     // Table overload that computes the arc sine values of each item in the input table.
     internal sealed class AsinTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AsinTableFunction()
             : base("Asin", TexlStrings.AboutAsinT, FunctionCategories.Table)
         {
         }
     }
-}
\ No newline at end of file
+}
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Atan.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Atan.cs
index ff6720119b..eda89ac960 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Atan.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Atan.cs
@@ -4,14 +4,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Atan(number:n)
     // Equivalent Excel function: Atan
     internal sealed class AtanFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AtanFunction()
             : base("Atan", TexlStrings.AboutAtan, FunctionCategories.MathAndStat)
         {
@@ -22,11 +23,12 @@ public AtanFunction()
     // Table overload that computes the arc tangent of each item in the input table.
     internal sealed class AtanTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AtanTableFunction()
             : base("Atan", TexlStrings.AboutAtanT, FunctionCategories.Table)
         {
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Atan2.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Atan2.cs
index 49b46eb325..7a6a75abbe 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Atan2.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Atan2.cs
@@ -6,6 +6,9 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Atan2(number:x, number:y)
@@ -14,8 +17,6 @@ internal sealed class Atan2Function : BuiltinFunction
     {
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public Atan2Function()
             : base(
                 "Atan2",
@@ -38,3 +39,6 @@ public Atan2Function()
         public override bool SupportsParamCoercion => true;
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Average.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Average.cs
index dac79dfaa4..735cc1345e 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Average.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Average.cs
@@ -5,14 +5,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Average(arg1:n, arg2:n, ..., argN:n)
     // Corresponding Excel function: Average
     internal sealed class AverageFunction : StatisticalFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public AverageFunction()
             : base("Average", TexlStrings.AboutAverage, FunctionCategories.MathAndStat)
         {
@@ -23,8 +24,6 @@ public AverageFunction()
     // Corresponding DAX function: Average
     internal sealed class AverageTableFunction : StatisticalTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override DelegationCapability FunctionDelegationCapability => DelegationCapability.Average;
 
         public AverageTableFunction()
@@ -33,3 +32,6 @@ public AverageTableFunction()
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Blank.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Blank.cs
index 1b4cc7378f..8654bd1b54 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Blank.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Blank.cs
@@ -6,6 +6,9 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Blank()
@@ -33,3 +36,6 @@ public BlankFunction()
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Boolean.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Boolean.cs
index 73953e0f79..4536fe6de3 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Boolean.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Boolean.cs
@@ -6,6 +6,9 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Boolean(arg:s)
@@ -14,8 +17,6 @@ internal sealed class BooleanFunction : BuiltinFunction
     {
         public const string BooleanInvariantFunctionName = "Boolean";
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
@@ -34,8 +35,6 @@ public BooleanFunction()
     // Boolean(arg:O)
     internal sealed class BooleanFunction_UO : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
@@ -56,3 +55,6 @@ public override string GetUniqueTexlRuntimeName(bool isPrefetching = false)
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Calendar.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Calendar.cs
index f70315b8a0..0084bb37ff 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Calendar.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Calendar.cs
@@ -7,6 +7,9 @@
 using Microsoft.PowerFx.Core.Types;
 using Microsoft.PowerFx.Core.Utils;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     internal abstract class CalendarFunction : BuiltinFunction
@@ -61,4 +64,7 @@ public WeekdaysShortFunction()
         {
         }
     }
-}
\ No newline at end of file
+}
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Char.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Char.cs
index 1b3a1eeb83..39d642b34e 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Char.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Char.cs
@@ -10,14 +10,15 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Char(arg:n) : s
     // Corresponding Excel function: Char
     internal sealed class CharFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -36,8 +37,6 @@ public CharFunction()
     // Char(arg:*[n]) : *[s]
     internal sealed class CharTFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -79,3 +78,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Clock.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Clock.cs
index 56c2c98009..d43cb81480 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Clock.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Clock.cs
@@ -7,6 +7,9 @@
 using Microsoft.PowerFx.Core.Types;
 using Microsoft.PowerFx.Core.Utils;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     internal class ClockFunction : BuiltinFunction
@@ -61,4 +64,7 @@ public IsClock24Function()
             yield return new TexlStrings.StringGetter[] { };
         }
     }
-}
\ No newline at end of file
+}
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Coalesce.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Coalesce.cs
index 887fb07127..cbc0855d39 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Coalesce.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Coalesce.cs
@@ -11,6 +11,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Coalesce(expression:E)
@@ -121,3 +124,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFade.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFade.cs
index d5a008a7e4..bf00ff8fce 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFade.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFade.cs
@@ -7,6 +7,9 @@
 using Microsoft.PowerFx.Core.Types;
 using Microsoft.PowerFx.Core.Types.Enums;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // ColorFade(color:c, fadeDelta:n)
@@ -37,3 +40,6 @@ public override IEnumerable<string> GetRequiredEnumNames()
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFadeT.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFadeT.cs
index 6a9e855f05..d87cbe5489 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFadeT.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFadeT.cs
@@ -12,6 +12,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // ColorFade(color:c|*[c], fadeDelta:n|*[n])
@@ -140,3 +143,6 @@ private bool CheckOtherType(DType otherType, TexlNode otherArg, DType expectedTy
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorValue.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorValue.cs
index f0263fc4c4..7ea88af13e 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorValue.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorValue.cs
@@ -6,14 +6,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // ColorValue(colorstring:s)
     // Returns the color value for the given color string
     internal sealed class ColorValueFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
@@ -28,4 +29,7 @@ public ColorValueFunction()
             yield return new[] { TexlStrings.ColorValueArg1 };
         }
     }
-}
\ No newline at end of file
+}
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concat.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concat.cs
index 4436cc1c82..86ef0e59cc 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concat.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concat.cs
@@ -6,6 +6,9 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Concat(source:*[...], expr, [separator:s])
@@ -30,3 +33,6 @@ public ConcatFunction()
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concatenate.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concatenate.cs
index 537ecc0c26..cf871e7b31 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concatenate.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concatenate.cs
@@ -10,6 +10,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Concatenate(source1:s, source2:s, ...)
@@ -151,3 +154,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Cos.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Cos.cs
index 6737159836..9fc34e89da 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Cos.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Cos.cs
@@ -4,14 +4,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Cos(number:n)
     // Equivalent Excel function: Cos
     internal sealed class CosFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public CosFunction()
             : base("Cos", TexlStrings.AboutCos, FunctionCategories.MathAndStat)
         {
@@ -22,11 +23,12 @@ public CosFunction()
     // Table overload that computes the cosine of each item in the input table.
     internal sealed class CosTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public CosTableFunction()
             : base("Cos", TexlStrings.AboutCosT, FunctionCategories.Table)
         {
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Cot.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Cot.cs
index 69f61e61c0..499b97256f 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Cot.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Cot.cs
@@ -4,14 +4,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Cot(number:n)
     // Equivalent Excel function: Cot
     internal sealed class CotFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public CotFunction()
             : base("Cot", TexlStrings.AboutCot, FunctionCategories.MathAndStat)
         {
@@ -22,11 +23,12 @@ public CotFunction()
     // Table overload that computes the cotangent of each item in the input table.
     internal sealed class CotTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public CotTableFunction()
             : base("Cot", TexlStrings.AboutCotT, FunctionCategories.Table)
         {
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Count.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Count.cs
index 00e699e21f..e94decb7f2 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Count.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Count.cs
@@ -11,6 +11,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Count(source:*)
@@ -64,3 +67,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountA.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountA.cs
index f22be913d2..2d0a9200c3 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountA.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountA.cs
@@ -11,6 +11,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // CountA(source:*)
@@ -58,3 +61,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountIf.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountIf.cs
index 8155a653c3..60de015781 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountIf.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountIf.cs
@@ -14,14 +14,15 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // CountIf(source:*, predicate:b [, predicate:b, ...])
     // Corresponding DAX function: CountAX, CountX
     internal sealed class CountIfFunction : FilterFunctionBase
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool SupportsParamCoercion => true;
 
         public override bool HasPreciseErrors => true;
@@ -137,3 +138,6 @@ public override bool IsServerDelegatable(CallNode callNode, TexlBinding binding)
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountRows.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountRows.cs
index 8283cc36a7..f93b277724 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountRows.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountRows.cs
@@ -12,6 +12,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // CountRows(source:*)
@@ -19,8 +22,6 @@ internal sealed class CountRowsFunction : FunctionWithTableInput
     {
         public const string CountRowsInvariantFunctionName = "CountRows";
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
@@ -110,8 +111,6 @@ private bool ExpressionContainsView(CallNode callNode, TexlBinding binding)
     // CountRows(arg: O)
     internal sealed class CountRowsFunction_UO : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
@@ -132,3 +131,6 @@ public override string GetUniqueTexlRuntimeName(bool isPrefetching = false)
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DateTime.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DateTime.cs
index d918b0e030..2db9128acf 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DateTime.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DateTime.cs
@@ -23,8 +23,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Equivalent DAX/Excel function: Date
     internal sealed class DateFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool HasPreciseErrors => true;
@@ -47,8 +45,6 @@ internal abstract class ExtractDateTimeFunctionBase : BuiltinFunction
     {
         public override bool HasPreciseErrors => true;
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -75,8 +71,6 @@ public override bool IsRowScopedServerDelegatable(CallNode callNode, TexlBinding
     // Equivalent DAX/Excel function: Time
     internal sealed class TimeFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool HasPreciseErrors => true;
@@ -98,8 +92,6 @@ public TimeFunction()
     // DateTime(year, month, day, hour, minute, second[, millisecond])
     internal sealed class DateTimeFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool HasPreciseErrors => true;
@@ -224,8 +216,6 @@ public SecondFunction()
     // Equivalent DAX/Excel function: Weekday
     internal sealed class WeekdayFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool HasPreciseErrors => true;
@@ -253,8 +243,6 @@ public override IEnumerable<string> GetRequiredEnumNames()
     // Equivalent DAX/Excel function: WeekNum
     internal sealed class WeekNumFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool HasPreciseErrors => true;
@@ -299,8 +287,6 @@ public ISOWeekNumFunction()
 
     internal abstract class DateTimeGenericFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool HasPreciseErrors => true;
@@ -381,8 +367,6 @@ public DateTimeValueFunction()
     // DateAdd(timestamp: d, delta: n, [ unit: TimeUnits ]) : d
     internal sealed class DateAddFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -455,8 +439,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
     // DateAdd(timestamp:d|*[d], delta:n|*[n], [unit:TimeUnits])
     internal sealed class DateAddTFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -569,8 +551,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
     // DateDiff(startdate: d, enddate : d, [ unit: TimeUnits ]) : n
     internal sealed class DateDiffFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool HasPreciseErrors => true;
@@ -605,8 +585,6 @@ public override bool HasSuggestionsForParam(int argumentIndex)
     // DateDiffT(start:d|*[d], end:d|*[d], [unit:TimeUnits])
     internal sealed class DateDiffTFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Degrees.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Degrees.cs
index 0e0f356805..61cd8af178 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Degrees.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Degrees.cs
@@ -4,14 +4,15 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Degrees(number:n)
     // Equivalent Excel function: Degrees
     internal sealed class DegreesFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public DegreesFunction()
             : base("Degrees", TexlStrings.AboutDegrees, FunctionCategories.MathAndStat)
         {
@@ -22,11 +23,12 @@ public DegreesFunction()
     // Table overload that computes the degrees values of each item in the input table.
     internal sealed class DegreesTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public DegreesTableFunction()
             : base("Degrees", TexlStrings.AboutDegreesT, FunctionCategories.Table)
         {
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DropColumns.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DropColumns.cs
index 7898c47973..3b3e65189b 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DropColumns.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DropColumns.cs
@@ -10,6 +10,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // DropColumns(source:*[...], name:s, name:s, ...)
@@ -116,3 +119,6 @@ public override bool HasSuggestionsForParam(int argumentIndex)
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/EndsWith.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/EndsWith.cs
index bea30c2ce5..acb665ab4b 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/EndsWith.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/EndsWith.cs
@@ -8,6 +8,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // EndsWith(text:s, end:s):b
@@ -39,3 +42,6 @@ public override bool IsRowScopedServerDelegatable(CallNode callNode, TexlBinding
         // Add overload for single-column table as the input for both endsWith and startsWith.
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Error.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Error.cs
index 0dc116e92f..2a654d140b 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Error.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Error.cs
@@ -12,6 +12,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Error([arg1: any])
@@ -19,8 +22,6 @@ internal sealed class ErrorFunction : BuiltinFunction
     {
         public override bool HasPreciseErrors => true;
 
-        public override bool RequiresErrorContext => true;
-
         public override bool CanSuggestInputColumns => true;
 
         public override bool IsSelfContained => true;
@@ -171,3 +172,6 @@ public override bool CheckInvocation(TexlNode[] args, DType[] argTypes, IErrorCo
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Exp.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Exp.cs
index 1facaacee5..7854a534c7 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Exp.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Exp.cs
@@ -4,6 +4,9 @@
 using Microsoft.PowerFx.Core.Localization;
 using Microsoft.PowerFx.Core.Types;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Exp(number:n)
@@ -12,8 +15,6 @@ internal sealed class ExpFunction : MathOneArgFunction
     {
         public override bool HasPreciseErrors => true;
 
-        public override bool RequiresErrorContext => true;
-
         public ExpFunction()
             : base("Exp", TexlStrings.AboutExp, FunctionCategories.MathAndStat)
         {
@@ -26,11 +27,12 @@ internal sealed class ExpTableFunction : MathOneArgTableFunction
     {
         public override bool HasPreciseErrors => true;
 
-        public override bool RequiresErrorContext => true;
-
         public ExpTableFunction()
             : base("Exp", TexlStrings.AboutExpT, FunctionCategories.Table)
         {
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs
index f76c8eadd2..07269243fa 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs
@@ -14,14 +14,15 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Filter(source:*, predicate1:b, [predicate2:b, ...])
     // Corresponding DAX function: Filter
     internal sealed class FilterFunction : FilterFunctionBase
     {
-        public override bool RequiresErrorContext => true;
-
         public FilterFunction()
             : base("Filter", TexlStrings.AboutFilter, FunctionCategories.Table, DType.EmptyTable, -2, 2, int.MaxValue, DType.EmptyTable)
         {
@@ -182,3 +183,6 @@ public override bool IsEcsExcemptedLambda(int index)
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FilterDelegationBase.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FilterDelegationBase.cs
index 3fc722cb11..475b044467 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FilterDelegationBase.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FilterDelegationBase.cs
@@ -10,6 +10,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Abstract base class for all functions "with scope", i.e. that take lambda parameters and participate in filter query server delegation. For example, Filter, LookUp.
@@ -149,3 +152,6 @@ protected bool IsValidDelegatableFilterPredicateNode(TexlNode dsNode, TexlBindin
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Find.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Find.cs
index 1eb217869b..1667c1a89e 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Find.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Find.cs
@@ -11,14 +11,15 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // Find(find_text:s, within_text:s, [start_index:n])
     // Equivalent DAX function: Find
     internal sealed class FindFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -38,8 +39,6 @@ public FindFunction()
     // Find(find_text:s|*[s], within_text:s|*[s], [start_index:n|*[n]])
     internal sealed class FindTFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -148,3 +147,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLast.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLast.cs
index 78131abcab..06c068f70c 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLast.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLast.cs
@@ -12,14 +12,15 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // First(source:*)
     // Last(source:*)
     internal sealed class FirstLastFunction : FunctionWithTableInput
     {
-        public override bool RequiresErrorContext => _isFirst;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
@@ -99,3 +100,6 @@ public override bool IsServerDelegatable(CallNode callNode, TexlBinding binding)
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ForAll.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ForAll.cs
index e7a6735f8e..b94fb9cbe6 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ForAll.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ForAll.cs
@@ -10,6 +10,9 @@
 using Microsoft.PowerFx.Core.Utils;
 using Microsoft.PowerFx.Syntax;
 
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
 namespace Microsoft.PowerFx.Core.Texl.Builtins
 {
     // ForAll(source:*, formula)
@@ -19,8 +22,6 @@ internal sealed class ForAllFunction : FunctionWithTableInput
 
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public override bool SupportsParamCoercion => false;
 
         public ForAllFunction()
@@ -74,3 +75,6 @@ public override string GetUniqueTexlRuntimeName(bool isPrefetching = false)
         }
     }
 }
+
+#pragma warning restore SA1402 // File may only contain a single type
+#pragma warning restore SA1649 // File name should match first type name
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/GUID.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/GUID.cs
index 3946ae360b..489649d8aa 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/GUID.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/GUID.cs
@@ -36,8 +36,6 @@ public GUIDNoArgFunction()
     // GUID(GuidString:s)
     internal sealed class GUIDPureFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IfError.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IfError.cs
index 365a37129d..6f49f2ff5c 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IfError.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IfError.cs
@@ -18,8 +18,6 @@ internal sealed class IfErrorFunction : BuiltinFunction
     {
         public override bool IsStrict => false;
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool HasLambdas => true;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Index.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Index.cs
index 33770c5bd1..cafc5447ef 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Index.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Index.cs
@@ -18,8 +18,6 @@ internal sealed class IndexFunction : FunctionWithTableInput
 
         public override bool SupportsParamCoercion => false;
 
-        public override bool RequiresErrorContext => true;
-
         public IndexFunction()
             : base(
                   "Index",
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LeftRight.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LeftRight.cs
index 4d9e544759..1604839785 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LeftRight.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LeftRight.cs
@@ -17,8 +17,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     //  Right(arg:s, count:n)
     internal sealed class LeftRightScalarFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -39,8 +37,6 @@ public LeftRightScalarFunction(bool isLeft)
     //  Right(arg:*[_:s], count:n)
     internal sealed class LeftRightTableScalarFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -89,8 +85,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
     //  Right(arg:*[_:s], count:*[_:n])
     internal sealed class LeftRightTableTableFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -142,8 +136,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
     //  Right(arg:s, count:*[_:n])
     internal sealed class LeftRightScalarTableFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Ln.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Ln.cs
index d711be2b7f..34861d7b7d 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Ln.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Ln.cs
@@ -12,8 +12,6 @@ internal sealed class LnFunction : MathOneArgFunction
     {
         public override bool HasPreciseErrors => true;
 
-        public override bool RequiresErrorContext => true;
-
         public LnFunction()
             : base("Ln", TexlStrings.AboutLn, FunctionCategories.MathAndStat)
         {
@@ -26,8 +24,6 @@ internal sealed class LnTableFunction : MathOneArgTableFunction
     {
         public override bool HasPreciseErrors => true;
 
-        public override bool RequiresErrorContext => true;
-
         public LnTableFunction()
             : base("Ln", TexlStrings.AboutLnT, FunctionCategories.Table)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Log.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Log.cs
index 2fa303033e..758cf07240 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Log.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Log.cs
@@ -21,8 +21,6 @@ internal sealed class LogFunction : BuiltinFunction
 
         public override bool HasPreciseErrors => true;
 
-        public override bool RequiresErrorContext => true;
-
         public LogFunction()
             : base("Log", TexlStrings.AboutLog, FunctionCategories.MathAndStat, DType.Number, 0, 1, 2, DType.Number, DType.Number)
         {
@@ -43,8 +41,6 @@ internal sealed class LogTFunction : BuiltinFunction
 
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public LogTFunction()
             : base("Log", TexlStrings.AboutLogT, FunctionCategories.MathAndStat, DType.EmptyTable, 0, 1, 2)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Logical.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Logical.cs
index 12152017fc..93b0840d68 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Logical.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Logical.cs
@@ -23,8 +23,6 @@ internal sealed class VariadicLogicalFunction : BuiltinFunction
 
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public override bool SupportsParamCoercion => true;
 
         internal readonly bool _isAnd;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Lookup.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Lookup.cs
index 548b090379..50c723bdc4 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Lookup.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Lookup.cs
@@ -19,8 +19,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // LookUp(source:*, predicate, [projectionFunc])
     internal sealed class LookUpFunction : FilterFunctionBase
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool SupportsParamCoercion => true;
 
         public override bool HasPreciseErrors => true;
@@ -53,7 +51,7 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
             // Ensure that the arg at index 1 is boolean or can coerece to boolean if they are OptionSetValues.
             if (argTypes[1].Kind == DKind.OptionSetValue && argTypes[1].CoercesTo(DType.Boolean))
             {
-                    CollectionUtils.Add(ref nodeToCoercedTypeMap, args[1], DType.Boolean, allowDupes: true);
+                CollectionUtils.Add(ref nodeToCoercedTypeMap, args[1], DType.Boolean, allowDupes: true);
             }
             else if (!DType.Boolean.Accepts(argTypes[1]))
             {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mid.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mid.cs
index 091a61fd05..3cc4aba901 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mid.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mid.cs
@@ -16,8 +16,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Mid(source:s, start:n, [count:n])
     internal sealed class MidFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -37,8 +35,6 @@ public MidFunction()
     // Mid(source:s|*[s], start:n|*[n], [count:n|*[n]])
     internal sealed class MidTFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMaxTable.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMaxTable.cs
index c81a7ad80a..5a8dd35c89 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMaxTable.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMaxTable.cs
@@ -19,8 +19,6 @@ internal sealed class MinMaxTableFunction : StatisticalTableFunction
     {
         private readonly DelegationCapability _delegationCapability;
 
-        public override bool RequiresErrorContext => true;
-
         public override DelegationCapability FunctionDelegationCapability => _delegationCapability;
 
         public MinMaxTableFunction(bool isMin)
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mod.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mod.cs
index f7790c12d0..73e053b49b 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mod.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mod.cs
@@ -19,8 +19,6 @@ internal sealed class ModFunction : BuiltinFunction
 
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public ModFunction()
             : base("Mod", TexlStrings.AboutMod, FunctionCategories.MathAndStat, DType.Number, 0, 2, 2, DType.Number, DType.Number)
         {
@@ -39,8 +37,6 @@ internal sealed class ModTFunction : BuiltinFunction
 
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public ModTFunction()
             : base("Mod", TexlStrings.AboutModT, FunctionCategories.Table, DType.EmptyTable, 0, 2, 2)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Power.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Power.cs
index 1c10d65104..a9a0397a29 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Power.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Power.cs
@@ -19,8 +19,6 @@ internal sealed class PowerFunction : BuiltinFunction
 
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public PowerFunction()
             : base("Power", TexlStrings.AboutPower, FunctionCategories.MathAndStat, DType.Number, 0, 2, 2, DType.Number, DType.Number)
         {
@@ -40,8 +38,6 @@ internal sealed class PowerTFunction : BuiltinFunction
 
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public PowerTFunction()
             : base("Power", TexlStrings.AboutPowerT, FunctionCategories.MathAndStat, DType.EmptyTable, 0, 2, 2)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Radians.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Radians.cs
index 55c201b10b..3d477f26ae 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Radians.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Radians.cs
@@ -10,8 +10,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Equivalent Excel function: Radians
     internal sealed class RadiansFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public RadiansFunction()
             : base("Radians", TexlStrings.AboutRadians, FunctionCategories.MathAndStat)
         {
@@ -22,8 +20,6 @@ public RadiansFunction()
     // Table overload that computes the radians values of each item in the input table.
     internal sealed class RadiansTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public RadiansTableFunction()
             : base("Radians", TexlStrings.AboutRadiansT, FunctionCategories.Table)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/RandBetween.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/RandBetween.cs
index 8fe94df4f8..eaffabfe07 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/RandBetween.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/RandBetween.cs
@@ -17,8 +17,6 @@ internal sealed class RandBetweenFunction : BuiltinFunction
 
         public override bool IsSelfContained => true;
 
-        public override bool RequiresErrorContext => true;
-
         public override bool SupportsParamCoercion => true;
 
         public RandBetweenFunction()
@@ -40,4 +38,4 @@ public RandBetweenFunction()
             yield return new[] { TexlStrings.RandBetweenArg1, TexlStrings.RandBetweenArg2 };
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Replace.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Replace.cs
index 794044a24e..21d7427409 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Replace.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Replace.cs
@@ -16,8 +16,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Replace(source:s, start:n, count:n, replacement:s)
     internal sealed class ReplaceFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -36,8 +34,6 @@ public ReplaceFunction()
     // Replace(source:s|*[s], start:n|*[n], count:n|*[n], replacement:s|*[s])
     internal sealed class ReplaceTFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sequence.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sequence.cs
index 0e8e354ebf..05e4824865 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sequence.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sequence.cs
@@ -12,8 +12,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Sequence(records:n, start:n, step:n): *[Value:n]
     internal sealed class SequenceFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sin.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sin.cs
index 9743839ec4..f85784b3c1 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sin.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sin.cs
@@ -10,8 +10,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Equivalent Excel function: Sin
     internal sealed class SinFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public SinFunction()
             : base("Sin", TexlStrings.AboutSin, FunctionCategories.MathAndStat)
         {
@@ -22,8 +20,6 @@ public SinFunction()
     // Table overload that computes the sine values of each item in the input table.
     internal sealed class SinTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public SinTableFunction()
             : base("Sin", TexlStrings.AboutSinT, FunctionCategories.Table)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/SortByColumns.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/SortByColumns.cs
index f44462dfb9..ec79589d77 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/SortByColumns.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/SortByColumns.cs
@@ -38,8 +38,6 @@ public SortByColumnsFunction()
             SignatureConstraint = new SignatureConstraint(omitStartIndex: 5, repeatSpan: 2, endNonRepeatCount: 0, repeatTopLength: 9);
         }
 
-        public override bool RequiresErrorContext => true;
-
         public override IEnumerable<TexlStrings.StringGetter[]> GetSignatures()
         {
             // Enumerate just the base overloads (the first 2 possibilities).
@@ -371,8 +369,6 @@ public SortByColumnsOrderTableFunction()
         {
         }
 
-        public override bool RequiresErrorContext => true;
-
         public override string GetUniqueTexlRuntimeName(bool isPrefetching = false)
         {
             return GetUniqueTexlRuntimeName(suffix: "OrderTable");
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sqrt.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sqrt.cs
index f67cfe5bf8..63be6e7a82 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sqrt.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sqrt.cs
@@ -10,8 +10,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Equivalent DAX function: Sqrt
     internal sealed class SqrtFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public SqrtFunction()
             : base("Sqrt", TexlStrings.AboutSqrt, FunctionCategories.MathAndStat)
         {
@@ -22,8 +20,6 @@ public SqrtFunction()
     // Table overload that computes the square root values of each item in the input table.
     internal sealed class SqrtTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public SqrtTableFunction()
             : base("Sqrt", TexlStrings.AboutSqrtT, FunctionCategories.Table)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Stdev.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Stdev.cs
index 851e55c0d3..080053db7e 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Stdev.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Stdev.cs
@@ -10,8 +10,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Corresponding Excel function: STDEV.P
     internal sealed class StdevPFunction : StatisticalFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public StdevPFunction()
             : base("StdevP", TexlStrings.AboutStdevP, FunctionCategories.MathAndStat)
         {
@@ -22,8 +20,6 @@ public StdevPFunction()
     // Corresponding DAX function: STDEV.P
     internal sealed class StdevPTableFunction : StatisticalTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public StdevPTableFunction()
             : base("StdevP", TexlStrings.AboutStdevPT, FunctionCategories.Table)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Substitute.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Substitute.cs
index c15c4b6175..1dae9f846d 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Substitute.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Substitute.cs
@@ -16,8 +16,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Substitute(source:s, match:s, replacement:s, [instanceCount:n])
     internal sealed class SubstituteFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -37,8 +35,6 @@ public SubstituteFunction()
     // Substitute(source:s|*[s], match:s|*[s], replacement:s|*[s], [instanceCount:n|*[n]])
     internal sealed class SubstituteTFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sum.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sum.cs
index 1a76a83cea..e69dbe3a6d 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sum.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sum.cs
@@ -10,8 +10,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Sum(arg1:n, arg2:n, ..., argN:n)
     internal sealed class SumFunction : StatisticalFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public SumFunction()
             : base("Sum", TexlStrings.AboutSum, FunctionCategories.MathAndStat)
         {
@@ -22,8 +20,6 @@ public SumFunction()
     // Corresponding DAX functions: Sum, SumX
     internal sealed class SumTableFunction : StatisticalTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override DelegationCapability FunctionDelegationCapability => DelegationCapability.Sum;
 
         public SumTableFunction()
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Table.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Table.cs
index ebc3ad2cca..10fd5684a2 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Table.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Table.cs
@@ -88,8 +88,6 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType
 
     internal class TableFunction_UO : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Tan.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Tan.cs
index 1f04b9ef68..e60e13dcbb 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Tan.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Tan.cs
@@ -10,8 +10,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Equivalent Excel function: Tan
     internal sealed class TanFunction : MathOneArgFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public TanFunction()
             : base("Tan", TexlStrings.AboutTan, FunctionCategories.MathAndStat)
         {
@@ -22,8 +20,6 @@ public TanFunction()
     // Table overload that computes the tangent of each item in the input table.
     internal sealed class TanTableFunction : MathOneArgTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public TanTableFunction()
             : base("Tan", TexlStrings.AboutTanT, FunctionCategories.Table)
         {
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Text.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Text.cs
index 36ce4faaf4..8f3dee57f1 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Text.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Text.cs
@@ -21,8 +21,6 @@ internal sealed class TextFunction : BuiltinFunction
     {
         public override bool SupportsParamCoercion => true;
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public TextFunction()
@@ -177,8 +175,6 @@ internal sealed class TextFunction_UO : BuiltinFunction
     {
         public override bool SupportsParamCoercion => false;
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public TextFunction_UO()
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/TimezoneOffset.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/TimezoneOffset.cs
index 1819b70cb5..aa0004abab 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/TimezoneOffset.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/TimezoneOffset.cs
@@ -11,8 +11,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // TimeZoneOffset()
     internal sealed class TimeZoneOffsetFunction : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/UntypedObject.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/UntypedObject.cs
index 63dc352791..9092624e7c 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/UntypedObject.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/UntypedObject.cs
@@ -14,8 +14,6 @@ internal sealed class ParseJSONFunction : BuiltinFunction
     {
         public const string ParseJSONInvariantFunctionName = "ParseJSON";
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
@@ -37,8 +35,6 @@ internal sealed class IndexFunction_UO : BuiltinFunction
     {
         public const string IndexInvariantFunctionName = "Index";
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Value.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Value.cs
index 0e908e4faf..880ee2d744 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Value.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Value.cs
@@ -19,8 +19,6 @@ internal sealed class ValueFunction : BuiltinFunction
     {
         public const string ValueInvariantFunctionName = "Value";
 
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => true;
@@ -86,8 +84,6 @@ public override bool HasSuggestionsForParam(int index)
     // Value(arg:O)
     internal sealed class ValueFunction_UO : BuiltinFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public override bool IsSelfContained => true;
 
         public override bool SupportsParamCoercion => false;
diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Variance.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Variance.cs
index 5292529cf8..88b34e81a7 100644
--- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Variance.cs
+++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Variance.cs
@@ -10,8 +10,6 @@ namespace Microsoft.PowerFx.Core.Texl.Builtins
     // Corresponding Excel function: VARP
     internal sealed class VarPFunction : StatisticalFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public VarPFunction()
             : base("VarP", TexlStrings.AboutVarP, FunctionCategories.MathAndStat)
         {
@@ -22,8 +20,6 @@ public VarPFunction()
     // Corresponding DAX function: VAR.P
     internal sealed class VarPTableFunction : StatisticalTableFunction
     {
-        public override bool RequiresErrorContext => true;
-
         public VarPTableFunction()
             : base("VarP", TexlStrings.AboutVarPT, FunctionCategories.Table)
         {