A bit more cleanup for discounts.