Make it more go packaging friendly.