Ready for changes in Go 1.4