An initial clean up of the Digest mechanism following the move away from dispatching within the mechanism.
WIP