I was actually annoyed that the Doctor took away Amy's identity based around him and then just subbed in an identity based around Rory. Because yes, Amy needs to be more focused on the relationship she's actually in, but it's still symbolically annoying.

Rory has reached the ultimate Zen phase of nursing, where you can simultaneously care about everyone, and also not give a shit about the world anymore.