Fix old-style switch instrs