Further audio refactoring.