further optimize resolve-var