Got to looking at this problem and ended up fixing a couple others as well.

The tax module now adds a subtotal line before the taxes, but only if there are taxes and other line items. I had to modify the payment module so it wouldn't add this subtotal into the order total on the checkout preview.

All these changes are available in the bazaar repository.