work around more commonly-unreachable 6g code sequences.
work around more commonly-unreachable 6g code sequences.

R=r
DELTA=23  (23 added, 0 deleted, 0 changed)
OCL=19405
CL=19420

tav/go,tav/go,tav/go,tav/go,tav/go,tav/go,tav/go