Simplify var def lookup

The extra gymnastics are not needed now that interactive eval sets
the var location metadata.