Improve support for older versions of Go.