More work on audio refactor.