Also clean up the code, make it more regular. Fixes #1416. R=rsc CC=golang-dev https://golang.org/cl/3985047
Attach a file by drag & drop or click to upload
