Remove scoped function expression issues: no-shadow