More bug fixes for handing/paypal integration.
Cleaning up Addons/ShippingAndHandling total collector.