Wav / 6 - further simplify stubs.