Fix up golint errors.