Try to clean up stream handling wrt audio channel counts.