simplify test to eliminate now-deprecated forms of switch.
simplify test to eliminate now-deprecated forms of switch.

R=rsc
DELTA=76  (0 added, 63 deleted, 13 changed)
OCL=26439
CL=26490

tv42/old-go,ssrl/go,tianon/debian-golang,dsriram/golang,tianon/debian-golang,nightlyone/golang,gnanderson/go,firebitsbr/golang-old,gnanderson/go,wesolows/golang-old,h8liu/golang,bdwalton/debian-golang,pombredanne/go-deleteme,dsriram/golang,bdwalton/debian-golang,gnanderson/go,bdwalton/debian-golang,tianon/debian-golang,tianon/debian-golang,ssrl/go,gnanderson/go,wesolows/golang,nightlyone/golang,gnanderson/go,wesolows/golang,wesolows/golang,wesolows/golang-old,nightlyone/golang,apparentlymart/golang,nightlyone/golang,firebitsbr/golang-old,wesolows/golang-old,pombredanne/go-deleteme,bdwalton/debian-golang,ssrl/go,wesolows/golang,h8liu/golang,dsriram/golang,ssrl/go,pombredanne/go-deleteme,h8liu/golang,wesolows/golang-old,wesolows/golang,gnanderson/go,nightlyone/golang,apparentlymart/golang,wesolows/golang,h8liu/golang,tv42/old-go,dsriram/golang,apparentlymart/golang,tv42/old-go,tv42/old-go,tv42/old-go,wesolows/golang-old,tianon/debian-golang,gnanderson/go,firebitsbr/golang-old,firebitsbr/golang-old,h8liu/golang,ssrl/go,firebitsbr/golang-old,firebitsbr/golang-old,pombredanne/go-deleteme,nightlyone/golang,wesolows/golang-old,apparentlymart/golang,apparentlymart/golang,apparentlymart/golang,dsriram/golang,nightlyone/golang,h8liu/golang,dsriram/golang,bdwalton/debian-golang,tv42/old-go,bdwalton/debian-golang,pombredanne/go-deleteme,bdwalton/debian-golang,wesolows/golang,ssrl/go,dsriram/golang,tianon/debian-golang,tianon/debian-golang,pombredanne/go-deleteme,pombredanne/go-deleteme,tianon/debian-golang,firebitsbr/golang-old,h8liu/golang,tv42/old-go,wesolows/golang-old,firebitsbr/golang-old,bdwalton/debian-golang,ssrl/go,apparentlymart/golang