Well nevermind, I removed that patch for the moment to get this going. If you were reviewing it, I did not mean to waste your time—I will happily send it after this MR, just let me know if you want/changed your mind please.
The goal of that patch was never to change any existing behavior, except for the 3 cases **I tested** (and thus were "fixed" by it). BTW would you have felt more comfortable if I introduced a new `outer_window` field in the inner window without touching the base's and only using it in the 3 cases I tested for, and then merged it with base.outer_window in a separate patch **as a no-op**? That was basically my intent after all.
Anyway do let me know if anything changed so I can send it after this MR at some point, even after code freeze if that's fine.