Trimming more conditionals from the parameter generator