go.exp -> go.tools

Also bring into line with latest API tweaks.