This is something probably too intricate for me to fix safely. Should I leave a TODO note in the next PR to remind you about looking into this?