Minor cleanup on the Go methods.