Tweaks to the ever-disastrous description switcher