Refactor AudioCommentator a bit.