Switching from 'escape hatch' to optional reduction_wrapper