[Resolver] Solved some scoping-related template param deduction regression