Fixes from golint and go vet.