fix: Preserve insertion order of Sets, fixes #819 (#976)

* Proposed fix for #819 to preserve Set insertion order

* Proposed fix for #819 (B)

We are already cloning and iterating over the Set. If we go a step further and clear it before iteration, and re-add all children during iteration, we can preserve insertion order.