You're actually right on both counts, but it was late and I was brain fried after a long week. I made the adjustments because, as you point out, that makes no sense at all from an objective reading. Andi does see the distinctions as much sharper than others might, though, for the reason you suggest - she didn't originally want to leave the Muggle world, and was pulled from it in a pretty jarring way.