WIP: fix eval scoping issues

closes #5987