Remove the useless NoJunk to replace this value by a null pointed std::function
Code simplified, small reorg.