cleanup pass before big edits
cleanup pass before big edits

R=rsc
DELTA=73  (27 added, 25 deleted, 21 changed)
OCL=32587
CL=32587

firebitsbr/golang-old,firebitsbr/golang-old,wesolows/golang-old,wesolows/golang,firebitsbr/golang-old,firebitsbr/golang-old,wesolows/golang,wesolows/golang-old,wesolows/golang,wesolows/golang-old,wesolows/golang,wesolows/golang,firebitsbr/golang-old,wesolows/golang-old,firebitsbr/golang-old,wesolows/golang,wesolows/golang-old,wesolows/golang-old,wesolows/golang-old,firebitsbr/golang-old,wesolows/golang,firebitsbr/golang-old