H10: Touch-up the audio source switching a bit. Actually fix my earlier errors when...