clean more
Russ Cox authored
R=r
DELTA=40  (9 added, 3 deleted, 28 changed)
OCL=35277
CL=35305
11d38055