window: Tighten up a comment and make it not depend on the previous lines
window: Drop compat lines no longer needed
window: Formatting tidy-ups to more cleanly show parallels