- more cleanups (simpler code for optional semi's, bug fixes)
- more cleanups (simpler code for optional semi's, bug fixes)

R=r
OCL=16869
CL=16869

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