WIP: fleshed out support for deferral budget in factory implementation, but there is no corresponding support from the nodes yet.
Remove unused exception types.
Merge from 'main'.