And, just remove the red colored SubPlans from the first figure.
I'm inclined to agree that re-hashing the artwork is a no-go for 1.10. Instead of removing the subplan text, can we ensure it is present on all appropriate nodes?
SubPlan(s) can represent multiple nodes (steps). Do we need to add it to all the nodes or add it to the first node of that particular subplan?