Fixed combineParams()

Think I fixed it. At least all the unit tests so far work. Will write
more tests to be sure.