Type-building of structs and variants. More changes to grammar