Go tool fixes, as proposed for the go distribution

Hi,

Thought it made sense to bring these fixes over to faux.

Cheers,
mwh