Changes suggested by rsc after last CL. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/6117044
Attach a file by drag & drop or click to upload