Minor audio reorg.