And fix some govet-caught format arg issues. R=r CC=golang-dev https://golang.org/cl/6354068
Attach a file by drag & drop or click to upload
