Little bit of fluff in preparation of Audio Only support.