adaptations to changes of go/types