window: Drop old compat code
window: Remove trailing whitespace
window: Add another point that I just thought of