Also clean up the code and allow \U. Fixes #3007. R=golang-dev, rsc, 0xjnml CC=golang-dev https://golang.org/cl/6492105
