window: Last apart from an off-by-one error in the preceding commit, anyway