Un-feature-gate struct variants