Yeah - that comment of his about having the rest of the River Song storyline occur offscreen? Looking back on that interview now, it seems obvious that he knew DT wasn't staying. I doubt there would be much if any reworking to be done with Moffat's scripts.