Remove a harmless (but potentially confusing) shadowed variable
golint++