tidy up some correctness issues reported by go vet

I use go vet (http://golang.org/cmd/go/#hdr-Run_go_tool_vet_on_packages) as a presubmit hook on almost all of my go code. It definitely helps with finding correctness problems.