(TBR because this is just addressing previous review comments.) R=r CC=golang-dev https://golang.org/cl/1697048
R=r, adg, rsc CC=golang-dev https://golang.org/cl/1684051