Making the test suite pass with Go 1.4beta1