Cleans up a few other corner cases too. R=ken2 CC=golang-dev https://golang.org/cl/1592045
Attach a file by drag & drop or click to upload
