Undo make composite

[qwerty]

Formerly we had Advanced/Make Composite which then turned into Advanced/Composite with a checkmark in front.

Now we have New Diagram/Composite Structure Diagram. And the reverse is via "New Diagram/...". This is sick, isn't it?

Then I wanted to redo the composition. I chose New Diagram/Select, and what happened? Nothing! No dialog popped up to let me choose a diagram. I had to select New Diagram/Composite... which took the diagram inside.

Then I made an element composite which was placed inside a composite element. Guess where the diagram went: top level of the package.

Testing? What? What for do we have customers? This is banana software. It gets ripe at the customer.

q.