Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -r9c88e0dae51cb591f71c556ecf69348af38ffba0 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision 9c88e0dae51cb591f71c556ecf69348af38ffba0)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs	(.../ClosingStructuresPlugin.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -723,7 +723,7 @@
                                                                     TreeViewControl treeViewControl)
         {
             StructuresCalculationScenario<ClosingStructuresInput> calculation = context.WrappedData;
-            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(GetInquiryHelper(), calculation);
+            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(calculation, GetInquiryHelper());
 
             IInquiryHelper inquiryHelper = GetInquiryHelper();
             IViewCommands viewCommands = Gui.ViewCommands;
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBase.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBase.cs	(.../ClearIllustrationPointsOfCalculationChangeHandlerBase.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBase.cs	(.../ClearIllustrationPointsOfCalculationChangeHandlerBase.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -39,11 +39,11 @@
         /// <summary>
         /// Creates a new instance of <see cref="ClearIllustrationPointsOfCalculationChangeHandlerBase{TCalculation}"/>.
         /// </summary>
-        /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <param name="calculation">The calculation to clear the illustration points for.</param>
+        /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <exception cref="ArgumentNullException">Thrown when any argument is <c>null</c>.</exception>
-        protected ClearIllustrationPointsOfCalculationChangeHandlerBase(IInquiryHelper inquiryHelper,
-                                                                        TCalculation calculation)
+        protected ClearIllustrationPointsOfCalculationChangeHandlerBase(
+            TCalculation calculation, IInquiryHelper inquiryHelper)
         {
             if (inquiryHelper == null)
             {
Index: Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandler.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/Common/src/Riskeer.Common.Forms/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandler.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandler.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -34,12 +34,12 @@
         /// <summary>
         /// Creates a new instance of <see cref="ClearIllustrationPointsOfStructuresCalculationHandler"/>.
         /// </summary>
-        /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <param name="calculation">The calculation to clear the illustration points for.</param>
+        /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
-        public ClearIllustrationPointsOfStructuresCalculationHandler(IInquiryHelper inquiryHelper,
-                                                                     IStructuresCalculation calculation)
-            : base(inquiryHelper, calculation) {}
+        public ClearIllustrationPointsOfStructuresCalculationHandler(
+            IStructuresCalculation calculation, IInquiryHelper inquiryHelper)
+            : base(calculation, inquiryHelper) {}
 
         public override bool ClearIllustrationPoints()
         {
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBaseTest.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBaseTest.cs	(.../ClearIllustrationPointsOfCalculationChangeHandlerBaseTest.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfCalculationChangeHandlerBaseTest.cs	(.../ClearIllustrationPointsOfCalculationChangeHandlerBaseTest.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -33,17 +33,6 @@
     public class ClearIllustrationPointsOfCalculationChangeHandlerBaseTest
     {
         [Test]
-        public void Constructor_InquiryHelperNull_ThrowsArgumentNullException()
-        {
-            // Call
-            TestDelegate call = () => new TestClearIllustrationPointsOfCalculationChangeHandler(null, new TestCalculation());
-
-            // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
-            Assert.AreEqual("inquiryHelper", exception.ParamName);
-        }
-
-        [Test]
         public void Constructor_CalculationNull_ThrowsArgumentNullException()
         {
             // Setup
@@ -52,14 +41,25 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate call = () => new TestClearIllustrationPointsOfCalculationChangeHandler(inquiryHelper, null);
+            void Call() => new TestClearIllustrationPointsOfCalculationChangeHandler(null, inquiryHelper);
 
             // Assert
-            var exception = Assert.Throws<ArgumentNullException>(call);
+            var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("calculation", exception.ParamName);
             mocks.VerifyAll();
         }
+        
+        [Test]
+        public void Constructor_InquiryHelperNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => new TestClearIllustrationPointsOfCalculationChangeHandler(new TestCalculation(), null);
 
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(Call);
+            Assert.AreEqual("inquiryHelper", exception.ParamName);
+        }
+
         [Test]
         public void Constructor_WithArguments_ExpectedValues()
         {
@@ -69,7 +69,7 @@
             mocks.ReplayAll();
 
             // Call
-            var handler = new TestClearIllustrationPointsOfCalculationChangeHandler(inquiryHelper, new TestCalculation());
+            var handler = new TestClearIllustrationPointsOfCalculationChangeHandler(new TestCalculation(), inquiryHelper);
 
             // Assert
             Assert.IsInstanceOf<IClearIllustrationPointsOfCalculationChangeHandler>(handler);
@@ -89,7 +89,7 @@
             inquiryHelper.Expect(h => h.InquireContinuation(expectedInquiry)).Return(expectedConfirmation);
             mocks.ReplayAll();
 
-            var handler = new TestClearIllustrationPointsOfCalculationChangeHandler(inquiryHelper, new TestCalculation());
+            var handler = new TestClearIllustrationPointsOfCalculationChangeHandler(new TestCalculation(), inquiryHelper);
 
             // Call
             bool confirmation = handler.InquireConfirmation();
@@ -112,7 +112,7 @@
             var calculation = new TestCalculation();
             calculation.Attach(observer);
 
-            var handler = new TestClearIllustrationPointsOfCalculationChangeHandler(inquiryHelper, calculation);
+            var handler = new TestClearIllustrationPointsOfCalculationChangeHandler(calculation, inquiryHelper);
 
             // Call
             handler.DoPostUpdateActions();
@@ -123,8 +123,8 @@
 
         private class TestClearIllustrationPointsOfCalculationChangeHandler : ClearIllustrationPointsOfCalculationChangeHandlerBase<TestCalculation>
         {
-            public TestClearIllustrationPointsOfCalculationChangeHandler(IInquiryHelper inquiryHelper, TestCalculation calculation)
-                : base(inquiryHelper, calculation) {}
+            public TestClearIllustrationPointsOfCalculationChangeHandler(TestCalculation calculation, IInquiryHelper inquiryHelper)
+                : base(calculation, inquiryHelper) {}
 
             public override bool ClearIllustrationPoints()
             {
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs	(.../ClearIllustrationPointsOfStructuresCalculationHandlerTest.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -44,7 +44,7 @@
             var calculation = new TestStructuresCalculation();
 
             // Call
-            var handler = new ClearIllustrationPointsOfStructuresCalculationHandler(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfStructuresCalculationHandler(calculation, inquiryHelper);
 
             // Assert
             Assert.IsInstanceOf<ClearIllustrationPointsOfCalculationChangeHandlerBase<IStructuresCalculation>>(handler);
@@ -61,7 +61,7 @@
             var inquiryHelper = mocks.StrictMock<IInquiryHelper>();
             mocks.ReplayAll();
 
-            var handler = new ClearIllustrationPointsOfStructuresCalculationHandler(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfStructuresCalculationHandler(calculation, inquiryHelper);
 
             bool hasOutput = calculation.HasOutput;
 
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler.cs	(.../ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler.cs	(.../ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -36,12 +36,12 @@
         /// <summary>
         /// Creates a new instance of <see cref="ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler"/>.
         /// </summary>
-        /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <param name="calculation">The calculation to clear the illustration points for.</param>
+        /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <exception cref="ArgumentNullException">Thrown when any argument is <c>null</c>.</exception>
-        public ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler(IInquiryHelper inquiryHelper,
-                                                                                         GrassCoverErosionInwardsCalculation calculation)
-            : base(inquiryHelper, calculation) {}
+        public ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler(
+            GrassCoverErosionInwardsCalculation calculation, IInquiryHelper inquiryHelper)
+            : base(calculation, inquiryHelper) {}
 
         public override bool ClearIllustrationPoints()
         {
Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r580c7cbe418a856f8e61ece99303e31eeea4475a -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision 580c7cbe418a856f8e61ece99303e31eeea4475a)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs	(.../GrassCoverErosionInwardsPlugin.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -932,8 +932,7 @@
                               }, inquiryHelper, viewCommands))
                           .AddClearIllustrationPointsOfCalculationItem(
                               () => GrassCoverErosionInwardsIllustrationPointsHelper.HasIllustrationPoints(calculation),
-                              new ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler(
-                                  inquiryHelper, calculation))
+                              new ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler(calculation, inquiryHelper))
                           .AddDeleteItem()
                           .AddSeparator()
                           .AddCollapseAllItem()
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandlerTest.cs
===================================================================
diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandlerTest.cs	(.../ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandlerTest.cs)	(revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandlerTest.cs	(.../ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandlerTest.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -46,7 +46,7 @@
             var calculation = new GrassCoverErosionInwardsCalculation();
 
             // Call
-            var handler = new ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler(calculation, inquiryHelper);
 
             // Assert
             Assert.IsInstanceOf<ClearIllustrationPointsOfCalculationChangeHandlerBase<GrassCoverErosionInwardsCalculation>>(handler);
@@ -64,7 +64,7 @@
             var inquiryHelper = mocks.StrictMock<IInquiryHelper>();
             mocks.ReplayAll();
 
-            var handler = new ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfGrassCoverErosionInwardsCalculationChangeHandler(calculation, inquiryHelper);
 
             // Call
             bool result = handler.ClearIllustrationPoints();
Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -rb63eeab5b28145e0ab5d4f3335674894703957e1 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision b63eeab5b28145e0ab5d4f3335674894703957e1)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs	(.../HeightStructuresPlugin.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -729,7 +729,7 @@
                                                                     TreeViewControl treeViewControl)
         {
             StructuresCalculationScenario<HeightStructuresInput> calculation = context.WrappedData;
-            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(GetInquiryHelper(), calculation);
+            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(calculation, GetInquiryHelper());
 
             IInquiryHelper inquiryHelper = GetInquiryHelper();
             IViewCommands viewCommands = Gui.ViewCommands;
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler.cs
===================================================================
diff -u -rb970bcbd5afc64a4bf0aefe66430bf344946f4dd -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/Piping/src/Riskeer.Piping.Forms/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler.cs	(.../ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler.cs)	(revision b970bcbd5afc64a4bf0aefe66430bf344946f4dd)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler.cs	(.../ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -36,12 +36,12 @@
         /// <summary>
         /// Creates a new instance of <see cref="ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler"/>.
         /// </summary>
-        /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <param name="calculation">The calculation to clear the illustration points for.</param>
+        /// <param name="inquiryHelper">Object responsible for inquiring confirmation.</param>
         /// <exception cref="ArgumentNullException">Thrown when any argument is <c>null</c>.</exception>
-        public ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(IInquiryHelper inquiryHelper,
-                                                                                    ProbabilisticPipingCalculationScenario calculation)
-            : base(inquiryHelper, calculation) {}
+        public ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(
+            ProbabilisticPipingCalculationScenario calculation, IInquiryHelper inquiryHelper)
+            : base(calculation, inquiryHelper) {}
 
         public override bool ClearIllustrationPoints()
         {
Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r6c8b4ff4349fcddb4f49400a073cda182e01a838 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 6c8b4ff4349fcddb4f49400a073cda182e01a838)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -1369,8 +1369,7 @@
                               }, inquiryHelper, viewCommands))
                           .AddClearIllustrationPointsOfCalculationItem(
                               () => ProbabilisticPipingIllustrationPointsHelper.HasIllustrationPoints(calculation),
-                              new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(
-                                  inquiryHelper, calculation))
+                              new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(calculation, inquiryHelper))
                           .AddDeleteItem()
                           .AddSeparator()
                           .AddCollapseAllItem()
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs
===================================================================
diff -u -rd108d281eac4c96d0ff49458436edc6698d4b8e4 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs	(.../ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs)	(revision d108d281eac4c96d0ff49458436edc6698d4b8e4)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/ChangeHandlers/ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs	(.../ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandlerTest.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -43,7 +43,7 @@
             var calculation = new ProbabilisticPipingCalculationScenario();
 
             // Call
-            var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(calculation, inquiryHelper);
 
             // Assert
             Assert.IsInstanceOf<ClearIllustrationPointsOfCalculationChangeHandlerBase<ProbabilisticPipingCalculationScenario>>(handler);
@@ -60,7 +60,7 @@
 
             var calculation = new ProbabilisticPipingCalculationScenario();
 
-            var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(calculation, inquiryHelper);
 
             // Call
             bool result = handler.ClearIllustrationPoints();
@@ -83,7 +83,7 @@
                 Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithoutIllustrationPoints()
             };
 
-            var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(calculation, inquiryHelper);
 
             // Call
             bool result = handler.ClearIllustrationPoints();
@@ -106,7 +106,7 @@
                 Output = PipingTestDataGenerator.GetRandomProbabilisticPipingOutputWithIllustrationPoints()
             };
 
-            var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(inquiryHelper, calculation);
+            var handler = new ClearIllustrationPointsOfProbabilisticPipingCalculationChangeHandler(calculation, inquiryHelper);
 
             // Call
             bool result = handler.ClearIllustrationPoints();
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rca5fe0ddef5ba3decce6c0c467cc3258c851b994 -rddad7117cf82255493a1a9f80b2c6562dc88bfd2
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision ca5fe0ddef5ba3decce6c0c467cc3258c851b994)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs	(.../StabilityPointStructuresPlugin.cs)	(revision ddad7117cf82255493a1a9f80b2c6562dc88bfd2)
@@ -731,7 +731,7 @@
                                                                     TreeViewControl treeViewControl)
         {
             StructuresCalculationScenario<StabilityPointStructuresInput> calculation = context.WrappedData;
-            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(GetInquiryHelper(), calculation);
+            var changeHandler = new ClearIllustrationPointsOfStructuresCalculationHandler(calculation, GetInquiryHelper());
 
             IInquiryHelper inquiryHelper = GetInquiryHelper();
             IViewCommands viewCommands = Gui.ViewCommands;