Need to back out of last change a little until I frees go-tools/types