Got rid of struct_variant feature-gate