Don't treat struct and variants as static_items

Closes #11681
Closes #11854