Rename speakers to channels, and remove an old incorrect comment