A few more changes for GOROOT.