Make ProductMixture::add_diff_step_*_of_2 safer to use