More correct handling of stereo channel mapping