truehd: Simplify rematrix_channels() as per Michael's original review.