Try to be a little more clever with filtered_parameters.
Fix merge conflict.