Make gen of charges with vouchers more than vanishingly unlikely

This does a better job covering good and bad cases in the implementation,
though currently none of the values resulting are used so they're still not actually covered.