Improved efficiency in SoundSwitch