diff --git a/source/Target/ThreadPlanStepOverRange.cpp b/source/Target/ThreadPlanStepOverRange.cpp
index 5b4ebaa..5deeb38 100644
--- a/source/Target/ThreadPlanStepOverRange.cpp
+++ b/source/Target/ThreadPlanStepOverRange.cpp
@@ -122,18 +122,12 @@ ThreadPlanStepOverRange::ShouldStop (Event *event_ptr)
             // inlined range, so I left that out too...
             
             bool older_ctx_is_equivalent = false;
-            if (m_addr_context.comp_unit)
+            if (m_addr_context.comp_unit
+                && m_addr_context.comp_unit == older_context.comp_unit
+                && m_addr_context.function && m_addr_context.function == older_context.function
+                && m_addr_context.block && m_addr_context.block == older_context.block)
             {
-                if (m_addr_context.comp_unit == older_context.comp_unit)
-                {
-                    if (m_addr_context.function && m_addr_context.function == older_context.function)
-                    {
-                        if (m_addr_context.block && m_addr_context.block == older_context.block)
-                        {
-                            older_ctx_is_equivalent = true;
-                        }
-                    }
-                }
+                older_ctx_is_equivalent = true;
             }
             else if (m_addr_context.symbol && m_addr_context.symbol == older_context.symbol)
             {