Tiny parameters merging refactoring

Required for later commits