Don't include the now-internal WindowStates