Coupon amounts for after tax discount. Closes #2485.
Margin fix. a98de826f05be39761b3a4078515e95b8f9be418