Ensure we always save to PaymentInfo and then prefer that over Person address.