Combining coinbase and transaction value sources

- I see now that this was a naive distinction that only serves to
confuse my code.
--- The combination in the mainline client is a convenient
simplification, not a bad shortcut.