window: Downgrade a TODO a bit