Refining payment APIs (ongoing work)