simplifications.
simplifications.

mark multifile section with TODO only
because that is a bigger change.

R=gri
DELTA=45  (9 added, 22 deleted, 14 changed)
OCL=33565
CL=33593

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