at least limit variable lookup to what we want

I'm not sure if the complete approach is the best option, but at least that change removes a lot of unwanted processing...