Improve resolving TypeParameter