Yes, absolutely -- and to throw in a shoutout for my favorite scene, Joss plays up the sexuality of Scott/Jean in the desert flashback (which was always a sexually-charged moment but here, as the man himself says, "au revoir, monsieur metaphor" -- because, leave it to Joss to make Jean Grey's, um, personal coloring into canon). And, as I alluded to in my writeup, he writes it in such a way that the sexual overtone is the soothing, happy part of the memory, and the focus of Scott's anxiety is elsewhere.