#220: Use PsiSubstitutor to properly resolve PsiMethod return types

#220: Use PsiSubstitutor to properly resolve PsiMethod return types #421