Move conditional variable assignments out of params.pp