I'm sure you already know this, but for future readers: check out gofix [0] when you find yourself in this situation.

[0] http://golang.org/cmd/fix/

[1] http://blog.golang.org/2011/04/introducing-gofix.html