#2656 via #2518 - Making the payment total and taxes honor separators