Modify findExpressionStatement() to take into consideration arguments