Fix errors causing go test to return an error code on osx.

[szank]

Clang was returning warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined] on osx.

This is quite annoying as it is generating ~20 lines of noise on every build and test run.

[erikdubbelboer]

Thanks!