Preparation for new mixing part 4

Yet another set of modifications to the expert-only "new mixing", not affecting default pileup mixing.