Handle properly modifier if/unless
Refine method call check