respect goto restrictions

R=gri
CC=golang-dev
https://golang.org/cl/4625044
17 files changed