@waddlesplash I've been thinking some more about this, and I realised that I could very easily just check if two-up is active and simply don't run the above (and some other) code in that case.
I think this would be good, since it would make these two PRs independent of each other.