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
abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go