window: Rework a TODO into something that might be codable