Big change to redo the transition from partial value masking to stage 1 splitting.