[BUGFIX beta] paramsFor: don’t clobber falsy params

Fixes #5275

and other minor cleanup