Makes it more efficient with Stripe's new `expand` api option. Also, handles refunds better.