I've got changes staged for a PR that (I believe) corrects the issue(s): https://github.com/lat9/zencart/tree...icing-with-tax

Comments/corrections appreciated.