Update to use fees and payees better.