window: Despite other changes making this less important, it's still worth keeping