Audio handling cleanup v2

Resubmitting previous request.  (I'm still getting used to using git for this sort of workflow.)