Bug 23115: (follow-up) Move switches to a TT block