Tidy up postage calculation to use RAW cart t