Do you mean the code I added in splitwindow2? Yes, that would better to have in the long term, and I'm working on that.
This PR is meant to fix immediate crashes/assertion failues, until better solutions are reviewed and merged.