In other news, I think I'm starting to be convinced that Moffat sometimes turns to DW fan-works for inspiration for his stories...

Unless this week's upcoming episode isn't in fact written by Moffat. In which case, never mind.