generate-make-shapes-no-variant now validates the main instances it
takes out of the variant. Only those main instances change. The old
container is not validated, as callers such as generate-relocate call
this function before they move the shapes out of it.
Check with thf/validates-shapes-last? that the function validates the
expected page and shapes.
AI-assisted-by: claude-opus-5-5