Renamed mix_pitch_and_residual() to normalise_residual(), after minor