Gofmt.
Remove dependency on private package for the range operation (2nd time).