Finish making golint happy