Fix some merge problems with new Noise classes.