estim_params: remove short-circuit ops, #476