diff --git a/src/Calculator/Common/AlwaysSelectedCollectionView.cs b/src/Calculator/Common/AlwaysSelectedCollectionView.cs
index 43db8d46..5a89a8e0 100644
--- a/src/Calculator/Common/AlwaysSelectedCollectionView.cs
+++ b/src/Calculator/Common/AlwaysSelectedCollectionView.cs
@@ -34,7 +34,7 @@ namespace CalculatorApp
                     if (newCurrentPosition != -1)
                     {
                         m_currentPosition = newCurrentPosition;
-                        CurrentChanged(this, null);
+                        CurrentChanged?.Invoke(this, null);
                         return true;
                     }
                 }
@@ -46,7 +46,7 @@ namespace CalculatorApp
                 {
                     Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, new Windows.UI.Core.DispatchedHandler(() =>
                     {
-                        CurrentChanged(this, null);
+                        CurrentChanged?.Invoke(this, null);
                     })).AsTask().Wait();
                 }
                 return false;
@@ -60,7 +60,7 @@ namespace CalculatorApp
                 }
 
                 m_currentPosition = index;
-                CurrentChanged(this, null);
+                CurrentChanged?.Invoke(this, null);
                 return true;
             }
 
@@ -219,7 +219,7 @@ namespace CalculatorApp
             void OnSourceBindableVectorChanged(Windows.UI.Xaml.Interop.IBindableObservableVector source, object e)
             {
                 Windows.Foundation.Collections.IVectorChangedEventArgs args = (Windows.Foundation.Collections.IVectorChangedEventArgs)e;
-                VectorChanged(this, args);
+                VectorChanged?.Invoke(this, args);
             }
 
             public event EventHandler<object> CurrentChanged;
diff --git a/src/Calculator/Controls/EquationTextBox.cs b/src/Calculator/Controls/EquationTextBox.cs
index b7dbe5cd..c3da8e40 100644
--- a/src/Calculator/Controls/EquationTextBox.cs
+++ b/src/Calculator/Controls/EquationTextBox.cs
@@ -406,7 +406,7 @@ namespace CalculatorApp
 
             private void OnEquationButtonClicked(object sender, RoutedEventArgs e)
             {
-                EquationButtonClicked(this, new RoutedEventArgs());
+                EquationButtonClicked?.Invoke(this, new RoutedEventArgs());
 
                 SetEquationButtonTooltipAndAutomationName();
             }
@@ -424,7 +424,7 @@ namespace CalculatorApp
                     m_richEditBox.MathText = "";
                 }
 
-                RemoveButtonClicked(this, new RoutedEventArgs());
+                RemoveButtonClicked?.Invoke(this, new RoutedEventArgs());
 
                 if (m_functionButton != null)
                 {
@@ -452,7 +452,7 @@ namespace CalculatorApp
 
             private void OnFunctionButtonClicked(object sender, RoutedEventArgs e)
             {
-                KeyGraphFeaturesButtonClicked(this, new RoutedEventArgs());
+                KeyGraphFeaturesButtonClicked?.Invoke(this, new RoutedEventArgs());
             }
 
             private void OnFunctionMenuButtonClicked(object sender, RoutedEventArgs e)
@@ -463,7 +463,7 @@ namespace CalculatorApp
                     m_richEditBox.SubmitEquation(EquationSubmissionSource.FOCUS_LOST);
                 }
 
-                KeyGraphFeaturesButtonClicked(this, new RoutedEventArgs());
+                KeyGraphFeaturesButtonClicked?.Invoke(this, new RoutedEventArgs());
             }
 
             private void OnRichEditMenuOpened(object sender, object args)
@@ -614,12 +614,12 @@ namespace CalculatorApp
                     }
                 }
 
-                EquationSubmitted(this, args);
+                EquationSubmitted?.Invoke(this, args);
             }
 
             private void OnEquationFormatRequested(object sender, MathRichEditBoxFormatRequest args)
             {
-                EquationFormatRequested(this, args);
+                EquationFormatRequested?.Invoke(this, args);
             }
         }
     }
diff --git a/src/Calculator/Controls/MathRichEditBox.cs b/src/Calculator/Controls/MathRichEditBox.cs
index fc2da2e2..73aefac2 100644
--- a/src/Calculator/Controls/MathRichEditBox.cs
+++ b/src/Calculator/Controls/MathRichEditBox.cs
@@ -150,7 +150,7 @@ namespace CalculatorApp
                 {
                     // Request the final formatting of the text
                     var formatRequest = new MathRichEditBoxFormatRequest(newVal);
-                    FormatRequest(this, formatRequest);
+                    FormatRequest?.Invoke(this, formatRequest);
 
                     if (!string.IsNullOrEmpty(formatRequest.FormattedText))
                     {
@@ -158,11 +158,11 @@ namespace CalculatorApp
                     }
 
                     SetValue(MathTextProperty, newVal);
-                    EquationSubmitted(this, new MathRichEditBoxSubmission(true, source));
+                    EquationSubmitted?.Invoke(this, new MathRichEditBoxSubmission(true, source));
                 }
                 else
                 {
-                    EquationSubmitted(this, new MathRichEditBoxSubmission(false, source));
+                    EquationSubmitted?.Invoke(this, new MathRichEditBoxSubmission(false, source));
                 }
             }
 
diff --git a/src/Calculator/Utils/DispatcherTimerDelayer.cs b/src/Calculator/Utils/DispatcherTimerDelayer.cs
index 6eb2ccb8..4363baaa 100644
--- a/src/Calculator/Utils/DispatcherTimerDelayer.cs
+++ b/src/Calculator/Utils/DispatcherTimerDelayer.cs
@@ -37,7 +37,7 @@ namespace CalculatorApp
         private void Timer_Tick(object sender, object e)
         {
             m_timer.Stop();
-            Action(this, null);
+            Action?.Invoke(this, null);
         }
 
         private DispatcherTimer m_timer;
diff --git a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs
index 71aeea97..24f9fabc 100644
--- a/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs
+++ b/src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cs
@@ -407,7 +407,7 @@ namespace CalculatorApp
 
         private void EquationTextBox_KeyGraphFeaturesButtonClicked(object sender, RoutedEventArgs e)
         {
-            KeyGraphFeaturesRequested(this, GetViewModelFromEquationTextBox(sender));
+            KeyGraphFeaturesRequested?.Invoke(this, GetViewModelFromEquationTextBox(sender));
         }
 
         private void EquationTextBox_EquationButtonClicked(object sender, RoutedEventArgs e)
@@ -565,7 +565,7 @@ namespace CalculatorApp
 
         private void EquationTextBox_EquationFormatRequested(object sender, MathRichEditBoxFormatRequest e)
         {
-            EquationFormatRequested(sender, e);
+            EquationFormatRequested?.Invoke(sender, e);
         }
 
         private void Slider_ValueChanged(object sender, RangeBaseValueChangedEventArgs e)
diff --git a/src/Calculator/Views/TitleBar.xaml.cs b/src/Calculator/Views/TitleBar.xaml.cs
index 0d8108b4..078bf1e7 100644
--- a/src/Calculator/Views/TitleBar.xaml.cs
+++ b/src/Calculator/Views/TitleBar.xaml.cs
@@ -199,7 +199,7 @@ namespace CalculatorApp
 
         private void AlwaysOnTopButton_Click(object sender, RoutedEventArgs e)
         {
-            AlwaysOnTopClick(this, e);
+            AlwaysOnTopClick?.Invoke(this, e);
         }
 
         private Windows.ApplicationModel.Core.CoreApplicationViewTitleBar m_coreTitleBar;