Fix a few minor vet quibbles while I'm here. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/13235059
Attach a file by drag & drop or click to upload
