Further simplify var def lookup