Windows: Factor out unused fields in container Upstream-commit: b0f3d7a1b5e52a446f52beaecbc30102e1b954d8 Component: engine