Removes confusing net versus gross distinction.

This is en route to generally moving more to a cash-based accounting. SPI
does this, and there is little reason we shouldn't also do so.