Refactor payment-claim logic to ensure MPP-claim atomicity