I'd have been dissapointed if Barrowman didn't show up...
Not so sure about Rory (unless it's a flashback)
Not sure why they conflated the two. One is a direct confirmation from BARROWMAN!!!*, the other more of a passing comment.
*That's he's now backtracking on slightly on Twitter, no doubt after a word from BBC PR people...