There are soooooooooo many problems with the stuff River said about hiding it from the Doctor. And his behaviour before Amy made her choice wasn't exactly wonderful either. Like a spoilt child losing his favourite toy.

But yep, we're firmly in Moffanon now. Canon was last seen passing by New Year's Eve 2005 ;)