Tidy-up after fixes required following go.tools API change