Moving the platform-specific window state fields into their own substructure