Added proper full argument declarations filtering