Revert "don't resolve variables to types for sub-evaluations"

This reverts commit 8a132bab3b39ce732a1c8784a95814de7a4ea456.
resolve variable to type when looking up scope