Remove arguments.callee from extend functionality