Use charge_incl_tax instead of basket_charge_incl_tax(). This is clearer. Backwards compatible versions of the old methods are kept for now. Related to #805