Yes, that was a really nice example of a scene doing multiple things, just as it should.

I think they have to keep some version of the Red Room, because of the "unmade" thing in _Avengers_; I guess that's separable from (1) super soldier and (2) older than she looks, when you get right down to it.