Make atomic decrement return the post decrement, and
bump the generator number.

This is done separately from other changes coming from GitHub to
reduce the differences that will be seen when doing that.
(This commit changes every single SPV output result.)

This represents both the following commits in GitHub master:
07ed11f9
48d6e798