Fix a merge conflict due to extra parameters.