Voucher API: Don't depend on optional arguments