Clean up some more code after bug143 was fixed.
Clean up some more code after bug143 was fixed.

R=r
APPROVED=r
DELTA=6  (0 added, 5 deleted, 1 changed)
OCL=27708
CL=27708

rflanagan/reginaldflanagan-project1,bryanxu/go-zh,sanjosh/sanjos100-tipc,webfd/go-zh,glycerine/jeaten-go-arrayof-structof,rdp/rogerpack2005-golang,d0f/go-zh,rflanagan/reginaldflanagan-project1,mhennings/marcohennings-go,rdp/rogerpack2005-golang,npe9/noahevans-go9,rdp/rogerpack2005-golang,d0f/go-zh,sanjosh/sanjos100-tipc,sanjosh/sanjos100-tipc,rdp/rogerpack2005-golang,Triskite/willstone-goclone,webfd/go-zh,rdp/rogerpack2005-golang,Triskite/willstone-goclone,bryanxu/go-zh,rdp/rogerpack2005-golang,rflanagan/reginaldflanagan-project1,rflanagan/reginaldflanagan-project1,bryanxu/go-zh,d0f/go-zh,glycerine/jeaten-go-arrayof-structof,scirelli/scirelli-go,glycerine/jeaten-go-arrayof-structof,scirelli/scirelli-go,sanjosh/sanjos100-tipc,mhennings/marcohennings-go,Triskite/willstone-goclone,npe9/noahevans-go9,npe9/noahevans-go9,rflanagan/reginaldflanagan-project1,glycerine/jeaten-go-arrayof-structof,scirelli/scirelli-go,glycerine/jeaten-go-arrayof-structof,Triskite/willstone-goclone,scirelli/scirelli-go,webfd/go-zh,npe9/noahevans-go9,sanjosh/sanjos100-tipc,rdp/rogerpack2005-golang,npe9/noahevans-go9,bryanxu/go-zh,scirelli/scirelli-go,d0f/go-zh,scirelli/scirelli-go,mhennings/marcohennings-go,mhennings/marcohennings-go,glycerine/jeaten-go-arrayof-structof,bryanxu/go-zh,rflanagan/reginaldflanagan-project1,Triskite/willstone-goclone,scirelli/scirelli-go,bryanxu/go-zh,sanjosh/sanjos100-tipc,d0f/go-zh,sanjosh/sanjos100-tipc,webfd/go-zh,rflanagan/reginaldflanagan-project1,mhennings/marcohennings-go,Triskite/willstone-goclone,d0f/go-zh,webfd/go-zh,webfd/go-zh,npe9/noahevans-go9,rflanagan/reginaldflanagan-project1,Triskite/willstone-goclone,Triskite/willstone-goclone,glycerine/jeaten-go-arrayof-structof,d0f/go-zh,webfd/go-zh,d0f/go-zh,npe9/noahevans-go9,glycerine/jeaten-go-arrayof-structof,mhennings/marcohennings-go,mhennings/marcohennings-go,webfd/go-zh,sanjosh/sanjos100-tipc,scirelli/scirelli-go,bryanxu/go-zh,npe9/noahevans-go9,rdp/rogerpack2005-golang,bryanxu/go-zh,mhennings/marcohennings-go