Update to new go.tools interfaces