Refactored latest changes to WavAudioFormat to avoid GCC compile problems.