Fixed use of eval() and new Function() to work within the correct scope (and not...