Small cleanups in the payment processor interfaces