Updates for golint.