qualify termexpr vars too