How was River able to stay so cool earlier in the series when she said she would see The Doctor again "when the pandoricon opens"? I appreciate she has to play things cool to avoid spoilers, but with the Doctor locked away, Amy shot, presumed dead, Rory reincarnated as an Auton, the Tardis destroyed and presumably her with it, it's stretching it a bit for her not to at least screw up her face a bit and look wary.
"history can be unritten" is the only way round this, I suspect, and I look forward to how it happens. Amy's house as another Tardis looks like a good mechanism for this to me...