go: rearrange to make things go-gettable