Fix a minor RFC violation relating to line termination.
WIP: Only merge extraneous parameters if explicitly allowed.