Minor changes in _bivar_factor_product