Apply suggestions from PR code review

Fix #6530

Author: RonHeck

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemAutomationPeer.cs

@@ -210,51 +210,44 @@ private List<AutomationPeer> GetChildrenFromVisualTree()
         {
             List<AutomationPeer> children = null;
 
-            iterate(Owner, ref children);
+            Iterate(Owner, ref children);
             return children;
         }
 
-        private static bool AddPeerToList(AutomationPeer peer, ref List<AutomationPeer> children)
+        private static void AddPeerToList(AutomationPeer peer, ref List<AutomationPeer> children)
         {
             if (children == null)
                 children = new List<AutomationPeer>();
 
             children.Add(peer);
-            return false;
         }
 
-        private static bool iterate(DependencyObject parent, ref List<AutomationPeer> children)
+        private static void Iterate(DependencyObject parent, ref List<AutomationPeer> children)
         {
-            bool done = false;
-
             if (parent != null)
             {
                 AutomationPeer peer = null;
                 int count = VisualTreeHelper.GetChildrenCount(parent);
-                for (int i = 0; i < count && !done; i++)
+                for (int i = 0; i < count; i++)
                 {
                     DependencyObject child = VisualTreeHelper.GetChild(parent, i);
 
-                    if (child != null
-                        && child is UIElement
-                        && (peer = CreatePeerForElement((UIElement)child)) != null)
+                    if (child is UIElement uiElement
+                        && (peer = CreatePeerForElement(uiElement)) != null)
                     {
-                        done = AddPeerToList(peer, ref children);
+                        AddPeerToList(peer, ref children);
                     }
-                    else if (child != null
-                        && child is UIElement3D
-                        && (peer = UIElement3DAutomationPeer.CreatePeerForElement(((UIElement3D)child))) != null)
+                    else if (child is UIElement3D uiElemenet3D
+                        && (peer = UIElement3DAutomationPeer.CreatePeerForElement(uiElemenet3D)) != null)
                     {
-                        done = AddPeerToList(peer, ref children);
+                        AddPeerToList(peer, ref children);
                     }
                     else
                     {
-                        done = iterate(child, ref children);
+                        Iterate(child, ref children);
                     }
                 }
             }
-
-            return done;
         }
 
         ///

src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Automation/Peers/MenuItemDataAutomationPeer.cs

@@ -75,8 +75,7 @@ void IExpandCollapseProvider.Expand()
             MenuItemAutomationPeer wrapperPeer = GetWrapperPeer() as MenuItemAutomationPeer;
             if (wrapperPeer != null)
             {
-                IExpandCollapseProvider expandCollapseProvider = wrapperPeer as IExpandCollapseProvider;
-                expandCollapseProvider.Expand();
+                ((IExpandCollapseProvider)wrapperPeer).Expand();
             }
             ThrowElementNotAvailableException();
         }
@@ -86,8 +85,7 @@ void IExpandCollapseProvider.Collapse()
             MenuItemAutomationPeer wrapperPeer = GetWrapperPeer() as MenuItemAutomationPeer;
             if (wrapperPeer != null)
             {
-                IExpandCollapseProvider expandCollapseProvider = wrapperPeer as IExpandCollapseProvider;
-                expandCollapseProvider.Collapse();
+                ((IExpandCollapseProvider)wrapperPeer).Collapse();
             }
             ThrowElementNotAvailableException();
         }
@@ -99,8 +97,7 @@ ExpandCollapseState IExpandCollapseProvider.ExpandCollapseState
                 MenuItemAutomationPeer wrapperPeer = GetWrapperPeer() as MenuItemAutomationPeer;
                 if (wrapperPeer != null)
                 {
-                    IExpandCollapseProvider expandCollapseProvider = wrapperPeer as IExpandCollapseProvider;
-                    return expandCollapseProvider.ExpandCollapseState;
+                    return ((IExpandCollapseProvider)wrapperPeer).ExpandCollapseState;
                 }
                 ThrowElementNotAvailableException();
                 return ExpandCollapseState.LeafNode;
@@ -119,8 +116,7 @@ void IInvokeProvider.Invoke()
             MenuItemAutomationPeer wrapperPeer = GetWrapperPeer() as MenuItemAutomationPeer;
             if (wrapperPeer != null)
             {
-                IInvokeProvider invokeProvider = wrapperPeer as IInvokeProvider;
-                invokeProvider.Invoke();
+                ((IInvokeProvider)wrapperPeer).Invoke();
             }
             else
             {
@@ -137,8 +133,7 @@ void IToggleProvider.Toggle()
             MenuItemAutomationPeer wrapperPeer = GetWrapperPeer() as MenuItemAutomationPeer;
             if (wrapperPeer != null)
             {
-                IToggleProvider toggleProvider = wrapperPeer as IToggleProvider;
-                toggleProvider.Toggle();
+                ((IToggleProvider)wrapperPeer).Toggle();
             }
             else
             {
@@ -153,8 +148,7 @@ ToggleState IToggleProvider.ToggleState
                 MenuItemAutomationPeer wrapperPeer = GetWrapperPeer() as MenuItemAutomationPeer;
                 if (wrapperPeer != null)
                 {
-                    IToggleProvider toggleProvider = wrapperPeer as IToggleProvider;
-                    return toggleProvider.ToggleState;
+                    return ((IToggleProvider)wrapperPeer).ToggleState;
                 }
                 ThrowElementNotAvailableException();
                 return ToggleState.Indeterminate;