Actually fixes #992, closes #996, adds support for payment transactions
to be tied to deliveries.