Fixes for #865 UPS/USPS notices

Added singular_shipping, since it is a candidate to cause these notices
too.