Point A is wrong. They have to do that because they account for those products differently and sarbanes oakley is a weird piece of legislation. But the iPhone is accounted for in a way that allows free updates.

But Point B is right on the money, its going to obviously be a new phone, not an add-on.