lint fixes; outer function arguments matching removed (arguments.callee.caller deprecated)