A little more cleanup for SDSwitch.