Finish making this compatible with the latest cwohlman:payments