Oh yeah. I've been keeping track of things in this season that are reminding me of past stuff in DW/TW, and that scene was a biggie. I really wonder wtf Moffat is doing with this stuff. Originally, I was annoyed, but ever since the SPACEWHALE, it has seemed purposeful and more like a puzzle that won't make sense until the last piece is in place.