Avoids passing a lot of callbacks as arguments and makes code easier to maintain.

Depends on D12371

Flow - this is just moving code to a hook, logic remains unchanged. Functionality tested later in the stack.