Small improvement in parsing declaration arguments
Refactoring to use PsiReference