Reformat, upgrade for Go 1.x.