Work towards new go/types version