Thanks to Charles Dorian for the help. R=rsc CC=Charlie Dorian, golang-dev https://golang.org/cl/207049
