Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs
===================================================================
diff -u -ra073f90798f50ba8c37b59664beddebf61db30b9 -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs)	(revision a073f90798f50ba8c37b59664beddebf61db30b9)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -40,13 +40,14 @@
         /// </summary>
         /// <param name="context">The <see cref="GrassCoverErosionOutwardsWaveConditionsInputContext"/> for which 
         /// the properties are shown.</param>
-        /// <param name="getNormativeAssessmentLevelFunc"><see cref="Func{TResult}"/> for obtaining the normative assessment level.</param>
+        /// <param name="normativeAssessmentLevel">The normative assessment level.</param>
         /// <param name="propertyChangeHandler">The handler responsible for handling effects of a property change.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="context"/> or
+        /// <paramref name="propertyChangeHandler"/> is <c>null</c>.</exception>
         public GrassCoverErosionOutwardsWaveConditionsInputContextProperties(GrassCoverErosionOutwardsWaveConditionsInputContext context,
-                                                                             Func<RoundedDouble> getNormativeAssessmentLevelFunc,
+                                                                             RoundedDouble normativeAssessmentLevel,
                                                                              IObservablePropertyChangeHandler propertyChangeHandler)
-            : base(context, getNormativeAssessmentLevelFunc(), propertyChangeHandler) {}
+            : base(context, normativeAssessmentLevel, propertyChangeHandler) {}
 
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.GrassCoverErosionOutwardsHydraulicBoundaryLocation_DesignWaterLevel_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.GrassCoverErosionOutwardsWaveConditionsInputContextProperties_DesignWaterLevel_Description))]
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -rab5044d23f83bbc1b8906f23a2a541162c6e6464 -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision ab5044d23f83bbc1b8906f23a2a541162c6e6464)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs	(.../GrassCoverErosionOutwardsPlugin.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -96,7 +96,7 @@
             {
                 CreateInstance = context => new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(
                     context,
-                    () => GetAssessmentLevel(context.Calculation),
+                    GetAssessmentLevel(context.Calculation),
                     new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData))
             };
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r1ab13c60f0a6168b2e959bc213d229d2c77af3b6 -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs)	(revision 1ab13c60f0a6168b2e959bc213d229d2c77af3b6)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -68,7 +68,7 @@
                 new GrassCoverErosionOutwardsFailureMechanism());
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Assert
             Assert.IsInstanceOf<WaveConditionsInputContextProperties<GrassCoverErosionOutwardsWaveConditionsInputContext>>(properties);
@@ -87,7 +87,7 @@
                 new GrassCoverErosionOutwardsFailureMechanism());
 
             // Call
-            var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
+            var properties = new GrassCoverErosionOutwardsWaveConditionsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextProperties.cs
===================================================================
diff -u -ra073f90798f50ba8c37b59664beddebf61db30b9 -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextProperties.cs	(.../StabilityStoneCoverWaveConditionsInputContextProperties.cs)	(revision a073f90798f50ba8c37b59664beddebf61db30b9)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextProperties.cs	(.../StabilityStoneCoverWaveConditionsInputContextProperties.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -39,13 +39,14 @@
         /// </summary>
         /// <param name="context">The <see cref="StabilityStoneCoverWaveConditionsInputContext"/> for which 
         /// the properties are shown.</param>
-        /// <param name="getNormativeAssessmentLevelFunc"><see cref="Func{TResult}"/> for obtaining the normative assessment level.</param>
+        /// <param name="normativeAssessmentLevel">The normative assessment level.</param>
         /// <param name="propertyChangeHandler">The handler responsible for handling effects of a property change.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="context"/> or
+        /// <paramref name="propertyChangeHandler"/> is <c>null</c>.</exception>
         public StabilityStoneCoverWaveConditionsInputContextProperties(StabilityStoneCoverWaveConditionsInputContext context,
-                                                                       Func<RoundedDouble> getNormativeAssessmentLevelFunc,
+                                                                       RoundedDouble normativeAssessmentLevel,
                                                                        IObservablePropertyChangeHandler propertyChangeHandler)
-            : base(context, getNormativeAssessmentLevelFunc(), propertyChangeHandler) {}
+            : base(context, normativeAssessmentLevel, propertyChangeHandler) {}
 
         public override string RevetmentType
         {
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r5175cc4c37a2c5701717a580c082f425caf70d27 -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 5175cc4c37a2c5701717a580c082f425caf70d27)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -69,7 +69,7 @@
             {
                 CreateInstance = context => new StabilityStoneCoverWaveConditionsInputContextProperties(
                     context,
-                    () => context.AssessmentSection.GetNormativeAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation),
+                    context.AssessmentSection.GetNormativeAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation),
                     new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData))
             };
         }
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -rad45524a6f877e082b77d9bafc1cee0e956367dd -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision ad45524a6f877e082b77d9bafc1cee0e956367dd)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs	(.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -53,7 +53,7 @@
                 Enumerable.Empty<ForeshoreProfile>());
 
             // Call
-            var properties = new StabilityStoneCoverWaveConditionsInputContextProperties(context, () => (RoundedDouble) 1.1, handler);
+            var properties = new StabilityStoneCoverWaveConditionsInputContextProperties(context, (RoundedDouble) 1.1, handler);
 
             // Assert
             Assert.IsInstanceOf<WaveConditionsInputContextProperties<StabilityStoneCoverWaveConditionsInputContext>>(properties);
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs
===================================================================
diff -u -ra073f90798f50ba8c37b59664beddebf61db30b9 -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs)	(revision a073f90798f50ba8c37b59664beddebf61db30b9)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -39,13 +39,14 @@
         /// </summary>
         /// <param name="context">The <see cref="WaveImpactAsphaltCoverWaveConditionsInputContext"/> for which 
         /// the properties are shown.</param>
-        /// <param name="getNormativeAssessmentLevelFunc"><see cref="Func{TResult}"/> for obtaining the normative assessment level.</param>
+        /// <param name="normativeAssessmentLevel">The normative assessment level.</param>
         /// <param name="propertyChangeHandler">The handler responsible for handling effects of a property change.</param>
-        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="context"/> or
+        /// <paramref name="propertyChangeHandler"/> is <c>null</c>.</exception>
         public WaveImpactAsphaltCoverWaveConditionsInputContextProperties(WaveImpactAsphaltCoverWaveConditionsInputContext context,
-                                                                          Func<RoundedDouble> getNormativeAssessmentLevelFunc,
+                                                                          RoundedDouble normativeAssessmentLevel,
                                                                           IObservablePropertyChangeHandler propertyChangeHandler)
-            : base(context, getNormativeAssessmentLevelFunc(), propertyChangeHandler) {}
+            : base(context, normativeAssessmentLevel, propertyChangeHandler) {}
 
         public override string RevetmentType
         {
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -ra663d0eb4c24012fdfafc00ee7aaffb18e75cb96 -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision a663d0eb4c24012fdfafc00ee7aaffb18e75cb96)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs	(.../WaveImpactAsphaltCoverPlugin.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -69,7 +69,7 @@
             {
                 CreateInstance = context => new WaveImpactAsphaltCoverWaveConditionsInputContextProperties(
                     context,
-                    () => context.AssessmentSection.GetNormativeAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation),
+                    context.AssessmentSection.GetNormativeAssessmentLevel(context.Calculation.InputParameters.HydraulicBoundaryLocation),
                     new ObservablePropertyChangeHandler(context.Calculation, context.WrappedData))
             };
         }
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -rad45524a6f877e082b77d9bafc1cee0e956367dd -rbbb17c2543d152e7567251a0432d59b4db72f33b
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs)	(revision ad45524a6f877e082b77d9bafc1cee0e956367dd)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsInputContextPropertiesTest.cs)	(revision bbb17c2543d152e7567251a0432d59b4db72f33b)
@@ -53,7 +53,7 @@
                 Enumerable.Empty<ForeshoreProfile>());
 
             // Call
-            var properties = new WaveImpactAsphaltCoverWaveConditionsInputContextProperties(context, () => (RoundedDouble) 1.1, handler);
+            var properties = new WaveImpactAsphaltCoverWaveConditionsInputContextProperties(context, (RoundedDouble) 1.1, handler);
 
             // Assert
             Assert.IsInstanceOf<WaveConditionsInputContextProperties<WaveImpactAsphaltCoverWaveConditionsInputContext>>(properties);